diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md
index 07593295..c48273ae 100644
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -22,6 +22,11 @@ diagrams:
           note right of {{ alias("D") }}
               {{ comment("D").text }}
           end note
+    mermaid:
+      after:
+        - '{% set e=element("A") %} note for {{ e.alias }} "{{ trim(e.comment.brief.0) }}"'
+        - '{% set e=element("clanguml::t00002::B") %} note for {{ e.alias }} "{{ trim(e.comment.brief.0) }}"'
+        - 'note for {{ alias("D") }} "{{ comment("D").text }}"'
 ```
 ## Source code
 File t00002.cc
@@ -620,7 +625,7 @@ private:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index e9cffe1c..19c4b806 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_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="362px" preserveAspectRatio="none" style="width:562px;height:362px;" version="1.1" viewBox="0 0 562 362" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1tlu9mg5juwft" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13ojq1iaq5z9m" 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"/>
@@ -9,123 +9,123 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tlu9mg5juwft)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ojq1iaq5z9m)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
       <ellipse cx="348.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,19.3438 L347.2031,24.4219 L349.5313,24.4219 L348.3594,19.3438 Z M346.875,17.1094 L349.8594,17.1094 L353.2188,29.5 L350.7656,29.5 L350,26.4375 L346.7188,26.4375 L345.9688,29.5 L343.5313,29.5 L346.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="46"/>
       <ellipse cx="305" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="314" y="54.2104">foo_a() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="58.8047"/>
       <ellipse cx="305" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="67.0151">foo_c() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tlu9mg5juwft)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ojq1iaq5z9m)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
       <ellipse cx="111.5" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,164.6406 Q113.8906,164.9375 113.25,165.0781 Q112.6094,165.2344 111.9063,165.2344 Q109.4063,165.2344 108.0781,163.5938 Q106.7656,161.9375 106.7656,158.8125 Q106.7656,155.6875 108.0781,154.0313 Q109.4063,152.375 111.9063,152.375 Q112.6094,152.375 113.25,152.5313 Q113.9063,152.6875 114.4688,152.9844 L114.4688,155.7031 Q113.8438,155.125 113.25,154.8594 Q112.6563,154.5781 112.0313,154.5781 Q110.6875,154.5781 110,155.6563 Q109.3125,156.7188 109.3125,158.8125 Q109.3125,160.9063 110,161.9844 Q110.6875,163.0469 112.0313,163.0469 Q112.6563,163.0469 113.25,162.7813 Q113.8438,162.5 114.4688,161.9219 L114.4688,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="163.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="175" y2="175"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="75.5" y="181"/>
       <ellipse cx="80.5" cy="186" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="189.2104">foo_a() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="195.8047" y2="195.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tlu9mg5juwft)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ojq1iaq5z9m)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
       <ellipse cx="348.55" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,164.6406 Q350.9406,164.9375 350.3,165.0781 Q349.6594,165.2344 348.9563,165.2344 Q346.4563,165.2344 345.1281,163.5938 Q343.8156,161.9375 343.8156,158.8125 Q343.8156,155.6875 345.1281,154.0313 Q346.4563,152.375 348.9563,152.375 Q349.6594,152.375 350.3,152.5313 Q350.9563,152.6875 351.5188,152.9844 L351.5188,155.7031 Q350.8938,155.125 350.3,154.8594 Q349.7063,154.5781 349.0813,154.5781 Q347.7375,154.5781 347.05,155.6563 Q346.3625,156.7188 346.3625,158.8125 Q346.3625,160.9063 347.05,161.9844 Q347.7375,163.0469 349.0813,163.0469 Q349.7063,163.0469 350.3,162.7813 Q350.8938,162.5 351.5188,161.9219 L351.5188,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="163.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="175" y2="175"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="313" y="181"/>
       <ellipse cx="318" cy="186" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="189.2104">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="195.8047" y2="195.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tlu9mg5juwft)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ojq1iaq5z9m)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
       <ellipse cx="98.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,286.6406 Q101.1406,286.9375 100.5,287.0781 Q99.8594,287.2344 99.1563,287.2344 Q96.6563,287.2344 95.3281,285.5938 Q94.0156,283.9375 94.0156,280.8125 Q94.0156,277.6875 95.3281,276.0313 Q96.6563,274.375 99.1563,274.375 Q99.8594,274.375 100.5,274.5313 Q101.1563,274.6875 101.7188,274.9844 L101.7188,277.7031 Q101.0938,277.125 100.5,276.8594 Q99.9063,276.5781 99.2813,276.5781 Q97.9375,276.5781 97.25,277.6563 Q96.5625,278.7188 96.5625,280.8125 Q96.5625,282.9063 97.25,283.9844 Q97.9375,285.0469 99.2813,285.0469 Q99.9063,285.0469 100.5,284.7813 Q101.0938,284.5 101.7188,283.9219 L101.7188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="285.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="303"/>
       <ellipse cx="44.5" cy="308" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="311.2104">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="315.8047"/>
       <ellipse cx="44.5" cy="320.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="324.0151">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="330.6094" y2="330.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="336.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="338.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="344.8198">as : std::vector&lt;A *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tlu9mg5juwft)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ojq1iaq5z9m)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
       <ellipse cx="469.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,286.6406 Q471.6406,286.9375 471,287.0781 Q470.3594,287.2344 469.6563,287.2344 Q467.1563,287.2344 465.8281,285.5938 Q464.5156,283.9375 464.5156,280.8125 Q464.5156,277.6875 465.8281,276.0313 Q467.1563,274.375 469.6563,274.375 Q470.3594,274.375 471,274.5313 Q471.6563,274.6875 472.2188,274.9844 L472.2188,277.7031 Q471.5938,277.125 471,276.8594 Q470.4063,276.5781 469.7813,276.5781 Q468.4375,276.5781 467.75,277.6563 Q467.0625,278.7188 467.0625,280.8125 Q467.0625,282.9063 467.75,283.9844 Q468.4375,285.0469 469.7813,285.0469 Q470.4063,285.0469 471,284.7813 Q471.5938,284.5 472.2188,283.9219 L472.2188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="285.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="303"/>
       <ellipse cx="414.5" cy="308" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="311.2104">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="315.8047"/>
       <ellipse cx="414.5" cy="320.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="324.0151">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="330.6094" y2="330.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="336.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="338.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="344.8198">as : std::vector&lt;A *&gt;</text>
     </a>
-    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f1tlu9mg5juwft)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f13ojq1iaq5z9m)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,32.5 L249,42.5 L259,42.5 L249,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="49.5669">This is class A</text>
-    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f1tlu9mg5juwft)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f13ojq1iaq5z9m)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,32.5 L105,42.5 L115,42.5 L105,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="49.5669">This is class B</text>
-    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f1tlu9mg5juwft)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f13ojq1iaq5z9m)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,265 L358,275 L368,275 L358,265 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="282.0669"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="297.1997">This is class D</text>
diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg
index c2e3f998..d7463afe 100644
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 426.921875 441" style="max-width: 426.922px; background-color: white;" width="100%" id="my-svg" width="427">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 643.00390625 532" style="max-width: 643.004px; background-color: white;" width="643.00390625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,14 +50,17 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M189.9140625,97.94326860135283L169.88802083333334,107.61939050112737C149.86197916666666,117.29551240090188,109.80989583333333,136.64775620045094,89.78385416666667,150.49054476689216C69.7578125,164.33333333333334,69.7578125,172.66666666666666,69.7578125,176.83333333333334L69.7578125,181"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M287.5242503612717,131L290.1491148843931,135.16666666666666C292.77397940751445,139.33333333333334,298.02370845375725,147.66666666666666,300.6485729768786,156C303.2734375,164.33333333333334,303.2734375,172.66666666666666,303.2734375,176.83333333333334L303.2734375,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M165.66076589595377,310L170.8032424132948,305.8333333333333C175.94571893063585,301.6666666666667,186.23067196531792,293.3333333333333,191.37314848265896,278.4166666666667C196.515625,263.5,196.515625,242,196.515625,220.5C196.515625,199,196.515625,177.5,199.03323699421966,162.58333333333334C201.5508489884393,147.66666666666666,206.58607297687863,139.33333333333334,209.10368497109826,135.16666666666666L211.62129696531792,131"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M69.7578125,260L69.7578125,264.1666666666667C69.7578125,268.3333333333333,69.7578125,276.6666666666667,70.72120363680155,285C71.68459477360308,293.3333333333333,73.61137704720616,301.6666666666667,74.57476818400771,305.8333333333333L75.53815932080924,310"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M244.859375,238.99252271942942L220.63802083333334,246.6604355995245C196.41666666666666,254.32834847961962,147.97395833333334,269.6641742398098,123.28182201348748,281.49875378657157C98.58968569364163,293.3333333333333,97.64812138728324,301.6666666666667,97.17733923410405,305.8333333333333L96.70655708092485,310"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M377.59334356936415,310L382.6285675578035,305.8333333333333C387.66379154624275,301.6666666666667,397.7342395231214,293.3333333333333,402.7694635115607,278.4166666666667C407.8046875,263.5,407.8046875,242,407.8046875,220.5C407.8046875,199,407.8046875,177.5,391.1119791666667,157.67008515516252C374.4192708333333,137.84017031032508,341.0338541666667,119.68034062065014,324.3411458333333,110.60042577581267L307.6484375,101.52051093097519"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M128.625,241.7091424830897L148.65104166666666,248.92428540257472C168.67708333333334,256.1394283220598,208.72916666666666,270.5697141610299,231.38007285645472,281.9515237471816C254.03097904624278,293.3333333333333,259.28070809248555,301.6666666666667,261.9055726156069,305.8333333333333L264.5304371387283,310"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M303.2734375,260L303.2734375,264.1666666666667C303.2734375,268.3333333333333,303.2734375,276.6666666666667,303.2734375,285C303.2734375,293.3333333333333,303.2734375,301.6666666666667,303.2734375,305.8333333333333L303.2734375,310"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M446.5,176.92166101504392L471.439453125,187.2680508458699C496.37890625,197.61444067669595,546.2578125,218.30722033834797,569.7860734108881,233.4869435025073C593.3143343217762,248.66666666666666,590.4919498935523,258.3333333333333,589.0807576794404,263.1666666666667L587.6695654653284,268"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M350.4728594653179,214L347.9552474710983,218.16666666666666C345.4376354768786,222.33333333333334,340.4024114884393,230.66666666666666,337.88479949421964,239.66666666666666C335.3671875,248.66666666666666,335.3671875,258.3333333333333,335.3671875,263.1666666666667L335.3671875,268"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M104.48046875,420.18307505317534L90.25325520833333,412.8192292109795C76.02604166666667,405.45538336878354,47.571614583333336,390.7276916843918,33.344401041666664,371.94717917552924C19.1171875,353.1666666666667,19.1171875,330.3333333333333,19.1171875,307.5C19.1171875,284.6666666666667,19.1171875,261.8333333333333,70.72526041666667,238.30293795491482C122.33333333333333,214.77254257649636,225.54947916666666,190.54508515299275,277.1575520833333,178.43135644124092L328.765625,166.3176277294891"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M517.26953125,328.8916115796672L495.6634114583333,336.74300964972264C474.0572916666667,344.5944077197781,430.8450520833333,360.29720385988907,389.2994791666667,376.71270088837883C347.75390625,393.1281979168687,307.875,410.2563958337375,287.935546875,418.8204947921718L267.99609375,427.38459375060614"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M335.3671875,347L335.3671875,351.8333333333333C335.3671875,356.6666666666667,335.3671875,366.3333333333333,324.138671875,377.67959984632984C312.91015625,389.0258663593263,290.453125,402.0517327186526,279.224609375,408.56466589831575L267.99609375,415.0775990779789"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M461.21233742774564,401L457.6600207731214,396.8333333333333C454.1077041184971,392.6666666666667,447.0030708092486,384.3333333333333,443.4507541546243,368.75C439.8984375,353.1666666666667,439.8984375,330.3333333333333,439.8984375,307.5C439.8984375,284.6666666666667,439.8984375,261.8333333333333,437.38082550578036,246.25C434.8632135115607,230.66666666666666,429.8279895231214,222.33333333333334,427.3103775289017,218.16666666666666L424.7927655346821,214"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M576.13671875,347L576.13671875,351.8333333333333C576.13671875,356.6666666666667,576.13671875,366.3333333333333,573.126497772158,375.3333333333333C570.116276794316,384.3333333333333,564.095834838632,392.6666666666667,561.08561386079,396.8333333333333L558.075392882948,401"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M393.78125,332.9825861983183L410.2161458333333,340.15215516526524C426.6510416666667,347.32172413221224,459.5208333333333,361.6608620661061,476.9795204118497,372.9970976997197C494.4382074903661,384.3333333333333,496.48578998073225,392.6666666666667,497.50958122591527,396.8333333333333L498.5333724710983,401"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M387.6328125,41L387.6328125,45.166666666666664C387.6328125,49.333333333333336,387.6328125,57.666666666666664,387.6328125,66C387.6328125,74.33333333333333,387.6328125,82.66666666666667,387.6328125,86.83333333333333L387.6328125,91"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M576.13671875,169L576.13671875,180.66666666666666C576.13671875,192.33333333333334,576.13671875,215.66666666666666,576.13671875,232.16666666666666C576.13671875,248.66666666666666,576.13671875,258.3333333333333,576.13671875,263.1666666666667L576.13671875,268"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M146.09375,351L146.09375,355.1666666666667C146.09375,359.3333333333333,146.09375,367.6666666666667,148.02749427986512,376C149.96123855973025,384.3333333333333,153.8287271194605,392.6666666666667,155.76247139932562,396.8333333333333L157.69621567919074,401"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -78,7 +81,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(196.515625, 220.5)" class="edgeLabel">
+        <g transform="translate(19.1171875, 307.5)" class="edgeLabel">
           <g transform="translate(-11.1171875, -9)" class="label">
             <foreignObject height="18" width="22.234375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -107,7 +110,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(407.8046875, 220.5)" class="edgeLabel">
+        <g transform="translate(439.8984375, 307.5)" class="edgeLabel">
           <g transform="translate(-11.1171875, -9)" class="label">
             <foreignObject height="18" width="22.234375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -136,9 +139,36 @@
             </foreignObject>
           </g>
         </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
       </g>
       <g class="nodes">
-        <a transform="translate(248.78125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L7">
+        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L7">
           <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
             <rect height="123" width="117.734375" y="-61.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -167,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.7578125, 220.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L16">
+        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L16">
           <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
             <rect height="79" width="117.734375" y="-39.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -191,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(303.2734375, 220.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L27">
+        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L27">
           <g title="This is class C - class C has a long comment" id="classId-C_0001142499429598587507-2" class="node default clickable">
             <rect height="79" width="116.828125" y="-39.5" x="-58.4140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
@@ -215,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(89.7578125, 371.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L36">
+        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L36">
           <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -249,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(303.2734375, 371.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00002/t00002.cc#L61">
+        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00002/t00002.cc#L61">
           <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -283,6 +313,39 @@
             </g>
           </g>
         </a>
+        <g transform="translate(387.6328125, 24.5)" id="note0" class="node undefined">
+          <rect height="33" width="116.359375" y="-16.5" x="-58.1796875" ry="0" rx="0"/>
+          <g transform="translate(-50.6796875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="101.359375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is class A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(576.13671875, 152.5)" id="note1" class="node undefined">
+          <rect height="33" width="117.25" y="-16.5" x="-58.625" ry="0" rx="0"/>
+          <g transform="translate(-51.125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="102.25">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is class B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(146.09375, 307.5)" id="note2" class="node undefined">
+          <rect height="87" width="161.71875" y="-43.5" x="-80.859375" ry="0" rx="0"/>
+          <g transform="translate(-73.359375, -36)" style="" class="label">
+            <rect/>
+            <foreignObject height="72" width="146.71875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel"><br/> This is class D<br/> which is a little like B<br/> and a little like C<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
       </g>
     </g>
   </g>
diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md
index 67f9cd09..8c5ae9f0 100644
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -833,7 +833,7 @@ int A::static_int = 1;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index b5e80234..1e1531c2 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_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="486px" preserveAspectRatio="none" style="width:347px;height:486px;" version="1.1" viewBox="0 0 347 486" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frtfp2jlh73t5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4gjg1808w9fh" 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"/>
@@ -9,227 +9,227 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frtfp2jlh73t5)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4gjg1808w9fh)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="53.2104">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="66.0151">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="78.8198">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="91.6245">A(const A &amp;) = deleted : void</text>
     </a>
     <ellipse cx="18" cy="101.2188" fill="#84BE84" 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="27" y="104.4292">A&lt;T&gt;(T t) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="117.2339">~A() = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="123.8281" y2="123.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="129.8281"/>
       <ellipse cx="18" cy="134.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="138.0386">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="142.6328"/>
       <ellipse cx="18" cy="147.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="150.8433">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="157.4375" y2="157.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="163.4375"/>
       <ellipse cx="18" cy="168.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="171.6479">operator++() : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="178.2422" y2="178.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="184.2422"/>
       <ellipse cx="18" cy="189.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="192.4526">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="197.0469"/>
       <ellipse cx="18" cy="202.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="205.2573">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="209.8516"/>
       <ellipse cx="18" cy="214.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="218.062">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="222.6563"/>
       <ellipse cx="18" cy="227.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="230.8667">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="235.4609"/>
       <ellipse cx="18" cy="240.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="243.6714">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="248.2656"/>
       <ellipse cx="18" cy="253.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="256.4761">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="261.0703"/>
       <ellipse cx="18" cy="266.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="269.2808">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="273.875"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="275.875"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="282.0854">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="286.6797"/>
       <polygon fill="#FFFF44" points="18,286.6797,22,290.6797,18,294.6797,14,290.6797" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="294.8901">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="299.4844"/>
       <ellipse cx="18" cy="304.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="195" x="27" y="307.6948">size() constexpr const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="312.2891"/>
       <ellipse cx="18" cy="317.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="320.4995">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="325.0938"/>
       <ellipse cx="18" cy="330.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="333.3042">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="339.8984" y2="339.8984"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="345.8984"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="347.8984"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="354.1089">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="358.7031"/>
       <ellipse cx="18" cy="363.7031" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="366.9136">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="371.5078"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="373.5078"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="379.7183">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="384.3125"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="386.3125"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="392.5229">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="397.1172"/>
       <polygon fill="#FFFF44" points="18,397.1172,22,401.1172,18,405.1172,14,401.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="405.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="409.9219"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="411.9219"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="418.1323">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="422.7266"/>
       <polygon fill="none" points="18,422.7266,22,426.7266,18,430.7266,14,426.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="430.937">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="435.5313"/>
       <ellipse cx="18" cy="440.5313" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="443.7417">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="448.3359"/>
       <ellipse cx="18" cy="453.3359" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="456.5464">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="461.1406"/>
       <ellipse cx="18" cy="466.1406" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="469.3511">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg
index 5e91cf2e..4594d1f7 100644
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 755" style="max-width: 400.75px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 755" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00003/t00003.cc#L7">
+        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00003/t00003.cc#L7">
           <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
             <rect height="739" width="384.75" y="-369.5" x="-192.375" class="outer title-state"/>
             <line y2="-339.5" y1="-339.5" x2="192.375" x1="-192.375" class="divider"/>
@@ -118,9 +118,9 @@
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -96)" height="18" width="73.359375">
+              <foreignObject transform="translate( -184.875, -96)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : void</span>
+                  <span class="nodeLabel">+A() : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, -74)" height="18" width="98.265625">
@@ -128,9 +128,9 @@
                   <span class="nodeLabel">+A(int i) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -52)" height="18" width="108.9375">
+              <foreignObject transform="translate( -184.875, -52)" height="18" width="170.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, -30)" height="18" width="140.078125">
@@ -143,9 +143,9 @@
                   <span class="nodeLabel">+A(T t) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 14)" height="18" width="82.703125">
+              <foreignObject transform="translate( -184.875, 14)" height="18" width="144.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : void</span>
+                  <span class="nodeLabel">+~A() : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 36)" height="18" width="202.796875">
@@ -173,9 +173,9 @@
                   <span class="nodeLabel">+basic_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 146)" height="18" width="163.203125">
+              <foreignObject transform="translate( -184.875, 146)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 168)" height="18" width="179.1875">
@@ -208,9 +208,9 @@
                   <span class="nodeLabel">#protected_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 300)" height="18" width="133.828125">
+              <foreignObject transform="translate( -184.875, 300)" height="18" width="259.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : std::size_t</span>
+                  <span class="nodeLabel">+size() : [const,constexpr] std::size_t</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 322)" height="18" width="149.84375">
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md
index 712fc9c6..c42e3995 100644
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
@@ -530,7 +530,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index d2e512cb..e276f324 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_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="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ayc67e3i8k9a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmkf3thc8701q" 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"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
       <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
@@ -28,38 +28,38 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
       <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="328"/>
       <ellipse cx="187.5" cy="333" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="196.5" y="336.2104">foo() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="340.8047"/>
       <ellipse cx="187.5" cy="345.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="349.0151">foo2() const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
       <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
       <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
@@ -69,16 +69,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
       <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
       <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
       <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
@@ -97,38 +97,38 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="336"/>
       <ellipse cx="501.5" cy="341" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="344.2104">b_int : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="348.8047"/>
       <ellipse cx="501.5" cy="353.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="357.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
       <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
       <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
       <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
@@ -137,8 +137,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
       <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="207.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="209.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="215.7104">b : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
       <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
@@ -164,16 +164,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
       <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
       <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
@@ -183,8 +183,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ayc67e3i8k9a)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmkf3thc8701q)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
       <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg
index d3147d30..3df6e59a 100644
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1496.015625 521" style="max-width: 1496.02px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1237.73828125 525" style="max-width: 1237.74px; background-color: white;" width="1237.73828125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,71 +50,77 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path style="fill:none" class="edge-pattern-solid relation" id="id1" d="M69.7578125,153L69.7578125,158.66666666666666C69.7578125,164.33333333333334,69.7578125,175.66666666666666,69.7578125,192.5C69.7578125,209.33333333333334,69.7578125,231.66666666666666,69.7578125,242.83333333333334L69.7578125,254"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id2" d="M316.625,311L316.625,322.1666666666667C316.625,333.3333333333333,316.625,355.6666666666667,316.625,372.5C316.625,389.3333333333333,316.625,400.6666666666667,316.625,406.3333333333333L316.625,412"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id3" d="M398.9140625,153L398.9140625,158.66666666666666C398.9140625,164.33333333333334,398.9140625,175.66666666666666,389.2921302356021,192.5C379.67019797120423,209.33333333333334,360.4263334424084,231.66666666666666,350.8044011780105,242.83333333333334L341.1824689136126,254"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id4" d="M234.3359375,109L234.3359375,122C234.3359375,135,234.3359375,161,243.95786976439788,185.16666666666666C253.5798020287958,209.33333333333334,272.8236665575916,231.66666666666666,282.4455988219895,242.83333333333334L292.0675310863874,254"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M691.0109485035211,109L707.4655039612676,122C723.9200594190141,135,756.829170334507,161,773.2837257922534,183.33333333333334C789.73828125,205.66666666666666,789.73828125,224.33333333333334,789.73828125,233.66666666666666L789.73828125,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M655.0078125,436.6874962283507L632.529296875,426.90624685695894C610.05078125,417.1249974855671,565.09375,397.5624987427836,542.615234375,371.86458270472514C520.13671875,346.1666666666667,520.13671875,314.3333333333333,520.13671875,282.5C520.13671875,250.66666666666666,520.13671875,218.83333333333334,536.5912742077466,189.91666666666666C553.045829665493,161,585.9549405809859,135,602.4094960387324,122L618.8640514964789,109"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id7" d="M1352.90625,311L1352.90625,322.1666666666667C1352.90625,333.3333333333333,1352.90625,355.6666666666667,1256.36328125,379.6084042917615C1159.8203125,403.5501419168563,966.734375,429.10028383371264,870.19140625,441.8753547921408L773.6484375,454.6504257505689"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1435.1953125,109L1435.1953125,122C1435.1953125,135,1435.1953125,161,1425.573380235602,185.16666666666666C1415.9514479712043,209.33333333333334,1396.7075834424086,231.66666666666666,1387.0856511780105,242.83333333333334L1377.4637189136126,254"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1270.6171875,142L1270.6171875,149.5C1270.6171875,157,1270.6171875,172,1280.2391197643979,190.66666666666666C1289.8610520287957,209.33333333333334,1309.1049165575917,231.66666666666666,1318.7268488219895,242.83333333333334L1328.3487810863874,254"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id10" d="M789.73828125,322L789.73828125,331.3333333333333C789.73828125,340.6666666666667,789.73828125,359.3333333333333,784.6811899038462,374.3333333333333C779.6240985576924,389.3333333333333,769.5099158653846,400.6666666666667,764.4528245192308,406.3333333333333L759.3957331730769,412"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id11" d="M638.91796875,344L638.91796875,349.6666666666667C638.91796875,355.3333333333333,638.91796875,366.6666666666667,643.9750600961538,378C649.0321514423077,389.3333333333333,659.1463341346154,400.6666666666667,664.2034254807692,406.3333333333333L669.2605168269231,412"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1097.1015625,153L1097.1015625,158.66666666666666C1097.1015625,164.33333333333334,1097.1015625,175.66666666666666,1087.2713514397906,192.5C1077.4411403795812,209.33333333333334,1057.7807182591623,231.66666666666666,1047.950507198953,242.83333333333334L1038.1202961387435,254"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id13" d="M928.9609375,109L928.9609375,122C928.9609375,135,928.9609375,161,938.7911485602094,185.16666666666666C948.6213596204188,209.33333333333334,968.2817817408377,231.66666666666666,978.1119928010471,242.83333333333334L987.9422038612565,254"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,87L68.875,96.33333333333333C68.875,105.66666666666667,68.875,124.33333333333333,68.875,139.33333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M212.359375,109L212.359375,114.66666666666667C212.359375,120.33333333333333,212.359375,131.66666666666666,212.359375,150.33333333333334C212.359375,169,212.359375,195,212.359375,208L212.359375,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.38858173076923,278L182.9266826923077,289.5C174.46478365384618,301,157.54098557692308,324,149.07908653846155,339.6666666666667C140.6171875,355.3333333333333,140.6171875,363.6666666666667,140.6171875,367.8333333333333L140.6171875,372"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M239.23798076923077,278L250.08373397435898,289.5C260.9294871794872,301,282.6209935897436,324,293.46674679487177,347C304.3125,370,304.3125,393,304.3125,404.5L304.3125,416"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M437.0859375,278L437.0859375,289.5C437.0859375,301,437.0859375,324,440.977390491453,345.1666666666667C444.86884348290596,366.3333333333333,452.6517494658119,385.6666666666667,456.5432024572649,395.3333333333333L460.43465544871793,405"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M504.203125,98.1446181413742L493.0169270833333,105.62051511781182C481.8307291666667,113.09641209424946,459.4583333333333,128.04820604712472,448.2721354166667,148.52410302356236C437.0859375,169,437.0859375,195,437.0859375,208L437.0859375,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M622.84375,68.07524586983449L700.2057291666666,80.56270489152874C777.5677083333334,93.05016391322299,932.2916666666666,118.02508195661149,1009.6536458333334,143.51254097830574C1087.015625,169,1087.015625,195,1087.015625,208L1087.015625,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1056.8515625,263.19348150303733L1026.0833333333333,277.1612345858644C995.3151041666666,291.12898766869154,933.7786458333334,319.0644938343458,903.0104166666666,344.53224691717287C872.2421875,370,872.2421875,393,872.2421875,404.5L872.2421875,416"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1110.9403245192307,278L1120.5941506410256,289.5C1130.2479767628204,301,1149.5556290064103,324,1159.209455128205,341.5C1168.86328125,359,1168.86328125,371,1168.86328125,377L1168.86328125,383"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M534.8743990384615,109L531.6596554487179,114.66666666666667C528.4449118589744,120.33333333333333,522.0154246794872,131.66666666666666,518.8006810897435,155.08333333333334C515.5859375,178.5,515.5859375,214,515.5859375,248C515.5859375,282,515.5859375,314.5,511.694484508547,340.4166666666667C507.80303151709404,366.3333333333333,500.0201255341881,385.6666666666667,496.1286725427351,395.3333333333333L492.23721955128207,405"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M592.1724759615385,109L595.3872195512821,114.66666666666667C598.6019631410256,120.33333333333333,605.0314503205128,131.66666666666666,608.2461939102565,144.83333333333334C611.4609375,158,611.4609375,173,611.4609375,180.5L611.4609375,188"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M838.6336446005918,87L829.3965267504932,96.33333333333333C820.1594089003944,105.66666666666667,801.6851732001973,124.33333333333333,792.4480553500986,139.33333333333334C783.2109375,154.33333333333334,783.2109375,165.66666666666666,783.2109375,171.33333333333334L783.2109375,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M895.0460428994082,87L904.2831607495068,96.33333333333333C913.5202785996056,105.66666666666667,931.9945142998027,124.33333333333333,941.2316321499014,146.66666666666666C950.46875,169,950.46875,195,950.46875,208L950.46875,221"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(316.625, 378)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(234.3359375, 187)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(520.13671875, 282.5)" class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(437.0859375, 143)" class="edgeLabel">
           <g transform="translate(-22.0234375, -9)" class="label">
             <foreignObject height="18" width="44.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -125,72 +131,78 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1352.90625, 378)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1435.1953125, 187)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(789.73828125, 378)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(928.9609375, 187)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
@@ -198,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.7578125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L4">
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L4">
           <g title="B" id="classId-C_0001232624428734051711-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -217,15 +229,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.7578125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L6">
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L6">
           <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -22.6640625, -43)" height="18" width="45.328125" class="classTitle">
@@ -233,17 +245,17 @@
                   <span class="nodeLabel">B::AA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_3</span>
                 </div>
@@ -251,11 +263,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(316.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L9">
+        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L9">
           <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
-            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="101" width="160.40625" y="-50.5" x="-80.203125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="80.203125" x1="-80.203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -267,20 +279,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 3)" height="18" width="84.9375">
+              <foreignObject transform="translate( -72.703125, 3)" height="18" width="136.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -72.703125, 25)" height="18" width="145.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo2() : void</span>
+                  <span class="nodeLabel">+foo2() : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(316.625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L13">
+        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L13">
           <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -299,15 +311,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(398.9140625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L15">
+        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L15">
           <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -51.984375, -43)" height="18" width="103.96875" class="classTitle">
@@ -315,17 +327,17 @@
                   <span class="nodeLabel">A::AA::Lights</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="44.46875">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">Green</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="45.671875">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="45.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">Yellow</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="29.359375">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="29.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">Red</span>
                 </div>
@@ -333,7 +345,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.3359375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L17">
+        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L17">
           <g title="A##AA##AAA" id="classId-C_0001430186633004282131-5" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -352,7 +364,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(654.9375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33">
+        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
             <rect height="57" width="87" y="-28.5" x="-43.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -371,7 +383,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.328125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L23">
+        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L23">
           <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
             <rect height="101" width="118.640625" y="-50.5" x="-59.3203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -400,7 +412,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1352.90625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L27">
+        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L27">
           <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -419,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1435.1953125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L28">
+        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L28">
           <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -438,15 +450,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1270.6171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L30">
+        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L30">
           <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
-            <rect height="123" width="123.515625" y="-61.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -54)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -45.3203125, -32)" height="18" width="90.640625" class="classTitle">
@@ -454,12 +466,12 @@
                   <span class="nodeLabel">C::AA::CCC</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 2)" height="18" width="52.46875">
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">CCC_1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 24)" height="18" width="52.46875">
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">CCC_2</span>
                 </div>
@@ -467,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(789.73828125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L33">
+        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
             <rect height="79" width="78.125" y="-39.5" x="-39.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -491,15 +503,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(638.91796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L39">
+        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L39">
           <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
-            <rect height="123" width="123.515625" y="-61.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -54)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -22.6640625, -32)" height="18" width="45.328125" class="classTitle">
@@ -507,12 +519,12 @@
                   <span class="nodeLabel">C::CC</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 2)" height="18" width="40.90625">
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="40.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">CC_1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 24)" height="18" width="40.90625">
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="40.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">CC_2</span>
                 </div>
@@ -520,7 +532,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1013.03125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L43">
+        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L43">
           <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
             <rect height="57" width="79" y="-28.5" x="-39.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -539,15 +551,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1097.1015625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L45">
+        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L45">
           <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -48.8828125, -43)" height="18" width="97.765625" class="classTitle">
@@ -555,17 +567,17 @@
                   <span class="nodeLabel">detail::D::AA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="39.140625">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="39.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">AA_3</span>
                 </div>
@@ -573,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(928.9609375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00004/t00004.cc#L47">
+        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00004/t00004.cc#L47">
           <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
             <rect height="57" width="112.765625" y="-28.5" x="-56.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md
index fe152111..50b87e4b 100644
--- a/docs/test_cases/t00005.md
+++ b/docs/test_cases/t00005.md
@@ -520,7 +520,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index 6070b1dd..75ed326f 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_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="384px" preserveAspectRatio="none" style="width:799px;height:384px;" version="1.1" viewBox="0 0 799 384" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ejw2uphhcgr5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10ysnr3ewypy3" 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"/>
@@ -9,205 +9,205 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
       <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
       <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
       <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
       <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
       <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
       <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
       <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
       <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
       <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
       <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
       <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ejw2uphhcgr5)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ysnr3ewypy3)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="54"/>
       <ellipse cx="308" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="66.8047"/>
       <ellipse cx="308" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="75.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="79.6094"/>
       <ellipse cx="308" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="87.8198">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="92.4141"/>
       <ellipse cx="308" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="100.6245">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="105.2188"/>
       <ellipse cx="308" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="113.4292">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="118.0234"/>
       <ellipse cx="308" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="126.2339">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="130.8281"/>
       <ellipse cx="308" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="139.0386">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="143.6328"/>
       <ellipse cx="308" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="151.8433">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="156.4375"/>
       <ellipse cx="308" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="164.6479">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="169.2422"/>
       <ellipse cx="308" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="177.4526">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="182.0469"/>
       <ellipse cx="308" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="190.2573">k : K *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="194.8516"/>
       <ellipse cx="308" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="203.062">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="207.6563"/>
       <ellipse cx="308" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="215.8667">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="220.4609"/>
       <ellipse cx="308" cy="225.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="228.6714">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="233.2656"/>
       <ellipse cx="308" cy="238.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="241.4761">some_int_reference : int &amp;</text>
     </a>
     <path d="M285.16,195.65 C219.46,233.13 136.34,281.08 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000630692407373144211&lt;-C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg
index 7643ce4c..d24eed87 100644
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 528" style="max-width: 796.641px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 528" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L3">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L3">
           <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L5">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L5">
           <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L7">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L7">
           <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L9">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L9">
           <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L11">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L11">
           <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L13">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L13">
           <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L15">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L15">
           <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L17">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L17">
           <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L19">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L19">
           <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L21">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L21">
           <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L23">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L23">
           <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00005/t00005.cc#L25">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00005/t00005.cc#L25">
           <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
             <rect height="387" width="245.8125" y="-193.5" x="-122.90625" class="outer title-state"/>
             <line y2="-163.5" y1="-163.5" x2="122.90625" x1="-122.90625" class="divider"/>
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md
index 7f90693e..27c44d24 100644
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -701,7 +701,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index fcf595a4..7195a8d1 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_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="479px" preserveAspectRatio="none" style="width:1390px;height:479px;" version="1.1" viewBox="0 0 1390 479" width="1390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fc6hs57841itg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4f3hjqw4t208" 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"/>
@@ -9,136 +9,136 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
       <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
       <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
       <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
       <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
       <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
       <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
       <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
       <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
       <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
       <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
       <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
       <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
       <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
       <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
       <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
       <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
       <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="448" y2="448"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="454"/>
       <ellipse cx="1232.5" cy="459" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="462.2104">data : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
       <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
@@ -164,103 +164,103 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc6hs57841itg)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4f3hjqw4t208)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
       <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="54"/>
       <ellipse cx="482" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="62.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="66.8047"/>
       <ellipse cx="482" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="75.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="79.6094"/>
       <ellipse cx="482" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="87.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="92.4141"/>
       <ellipse cx="482" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="100.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="105.2188"/>
       <ellipse cx="482" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="113.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="118.0234"/>
       <ellipse cx="482" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="126.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="130.8281"/>
       <ellipse cx="482" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="139.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="143.6328"/>
       <ellipse cx="482" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="151.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="156.4375"/>
       <ellipse cx="482" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="164.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="169.2422"/>
       <ellipse cx="482" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="177.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="182.0469"/>
       <ellipse cx="482" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="190.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="194.8516"/>
       <ellipse cx="482" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="203.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="207.6563"/>
       <ellipse cx="482" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="215.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000050153113082434858-&gt;C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg
index 3c8f0c9b..5926bc36 100644
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.88671875 613" style="max-width: 1446.89px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.88671875 613" style="max-width: 1446.89px; background-color: white;" width="1446.88671875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -70,20 +70,24 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M720.40234375,231.88701122067323L784.599609375,257.4058426838944C848.796875,282.92467414711547,977.19140625,333.96233707355776,1041.388671875,365.14783520344554C1105.5859375,396.3333333333333,1105.5859375,407.6666666666667,1105.5859375,413.3333333333333L1105.5859375,419"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -266,7 +270,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L7">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L7">
           <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -285,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L9">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L9">
           <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -304,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L11">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L11">
           <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -323,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L13">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L13">
           <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -342,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L15">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L15">
           <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -361,7 +365,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L17">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L17">
           <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -380,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L19">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L19">
           <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -399,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L21">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L21">
           <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -418,7 +422,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L23">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L23">
           <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -437,7 +441,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L25">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L25">
           <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -456,7 +460,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L27">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L27">
           <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -475,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L29">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L29">
           <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -494,7 +498,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L31">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L31">
           <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
             <rect height="57" width="28.328125" y="-28.5" x="-14.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -513,7 +517,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L33">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L33">
           <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -532,7 +536,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L35">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L35">
           <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -551,7 +555,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L37">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L37">
           <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -570,7 +574,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
             <rect height="79" width="181.28125" y="-39.5" x="-90.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -594,7 +598,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
             <rect height="57" width="182.171875" y="-28.5" x="-91.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -613,7 +617,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00006/t00006.cc#L44">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00006/t00006.cc#L44">
           <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
             <rect height="343" width="263.578125" y="-171.5" x="-131.7890625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md
index 410b5a7b..1710a4c5 100644
--- a/docs/test_cases/t00007.md
+++ b/docs/test_cases/t00007.md
@@ -174,7 +174,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index b902e5d7..068bb90a 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_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="230px" preserveAspectRatio="none" style="width:207px;height:230px;" version="1.1" viewBox="0 0 207 230" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1c7at59jiuoz4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ehck6uvnj8vw" 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"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c7at59jiuoz4)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ehck6uvnj8vw)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c7at59jiuoz4)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ehck6uvnj8vw)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
       <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c7at59jiuoz4)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ehck6uvnj8vw)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
       <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c7at59jiuoz4)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ehck6uvnj8vw)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
       <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="54"/>
       <ellipse cx="32.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="62.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="66.8047"/>
       <ellipse cx="32.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="75.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="79.6094"/>
       <ellipse cx="32.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="87.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000066905874721300157&lt;-C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg
index 182b5119..ab6659d1 100644
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 198.671875 264" style="max-width: 198.672px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 198.671875 264" style="max-width: 198.672px; background-color: white;" width="198.671875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L5">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L5">
           <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L7">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L7">
           <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L9">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L9">
           <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00007/t00007.cc#L11">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00007/t00007.cc#L11">
           <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
             <rect height="123" width="182.671875" y="-61.5" x="-91.3359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md
index 50bf46b6..31dfe453 100644
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -563,7 +563,7 @@ template <> struct E::nested_template<char> {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index 192e051d..7c614411 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_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="403px" preserveAspectRatio="none" style="width:1039px;height:403px;" version="1.1" viewBox="0 0 1039 403" width="1039px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1391f4cwntkc7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhrarnbviyuy1" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
@@ -19,50 +19,50 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="62.2104">comparator : CMP</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="75.0151">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
       <ellipse cx="17" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="87.8198">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
       <ellipse cx="17" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="100.6245">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="105.2188"/>
       <ellipse cx="17" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="113.4292">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="118.0234"/>
       <ellipse cx="17" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="126.2339">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
       <ellipse cx="300.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.2188,61.6406 Q302.6406,61.9375 302,62.0781 Q301.3594,62.2344 300.6563,62.2344 Q298.1563,62.2344 296.8281,60.5938 Q295.5156,58.9375 295.5156,55.8125 Q295.5156,52.6875 296.8281,51.0313 Q298.1563,49.375 300.6563,49.375 Q301.3594,49.375 302,49.5313 Q302.6563,49.6875 303.2188,49.9844 L303.2188,52.7031 Q302.5938,52.125 302,51.8594 Q301.4063,51.5781 300.7813,51.5781 Q299.4375,51.5781 298.75,52.6563 Q298.0625,53.7188 298.0625,55.8125 Q298.0625,57.9063 298.75,58.9844 Q299.4375,60.0469 300.7813,60.0469 Q301.4063,60.0469 302,59.7813 Q302.5938,59.5 303.2188,58.9219 L303.2188,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="320.75" y="60.1543">Vector</text>
@@ -71,15 +71,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="86"/>
       <ellipse cx="261" cy="91" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="270" y="94.2104">values : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
       <ellipse cx="548.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.7188,353.6406 Q551.1406,353.9375 550.5,354.0781 Q549.8594,354.2344 549.1563,354.2344 Q546.6563,354.2344 545.3281,352.5938 Q544.0156,350.9375 544.0156,347.8125 Q544.0156,344.6875 545.3281,343.0313 Q546.6563,341.375 549.1563,341.375 Q549.8594,341.375 550.5,341.5313 Q551.1563,341.6875 551.7188,341.9844 L551.7188,344.7031 Q551.0938,344.125 550.5,343.8594 Q549.9063,343.5781 549.2813,343.5781 Q547.9375,343.5781 547.25,344.6563 Q546.5625,345.7188 546.5625,347.8125 Q546.5625,349.9063 547.25,350.9844 Q547.9375,352.0469 549.2813,352.0469 Q549.9063,352.0469 550.5,351.7813 Q551.0938,351.5 551.7188,350.9219 L551.7188,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="569.25" y="352.1543">B</text>
@@ -88,15 +88,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496" y="378"/>
       <ellipse cx="501" cy="383" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="510" y="386.2104">template_template : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
       <ellipse cx="541" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M543.9688,238.1406 Q543.3906,238.4375 542.75,238.5781 Q542.1094,238.7344 541.4063,238.7344 Q538.9063,238.7344 537.5781,237.0938 Q536.2656,235.4375 536.2656,232.3125 Q536.2656,229.1875 537.5781,227.5313 Q538.9063,225.875 541.4063,225.875 Q542.1094,225.875 542.75,226.0313 Q543.4063,226.1875 543.9688,226.4844 L543.9688,229.2031 Q543.3438,228.625 542.75,228.3594 Q542.1563,228.0781 541.5313,228.0781 Q540.1875,228.0781 539.5,229.1563 Q538.8125,230.2188 538.8125,232.3125 Q538.8125,234.4063 539.5,235.4844 Q540.1875,236.5469 541.5313,236.5469 Q542.1563,236.5469 542.75,236.2813 Q543.3438,236 543.9688,235.4219 L543.9688,238.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="555" y="236.6543">B</text>
@@ -105,8 +105,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="248.5" y2="248.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="256.5" y2="256.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
       <ellipse cx="569.75" cy="39.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M572.7188,45.1406 Q572.1406,45.4375 571.5,45.5781 Q570.8594,45.7344 570.1563,45.7344 Q567.6563,45.7344 566.3281,44.0938 Q565.0156,42.4375 565.0156,39.3125 Q565.0156,36.1875 566.3281,34.5313 Q567.6563,32.875 570.1563,32.875 Q570.8594,32.875 571.5,33.0313 Q572.1563,33.1875 572.7188,33.4844 L572.7188,36.2031 Q572.0938,35.625 571.5,35.3594 Q570.9063,35.0781 570.2813,35.0781 Q568.9375,35.0781 568.25,36.1563 Q567.5625,37.2188 567.5625,39.3125 Q567.5625,41.4063 568.25,42.4844 Q568.9375,43.5469 570.2813,43.5469 Q570.9063,43.5469 571.5,43.2813 Q572.0938,43 572.7188,42.4219 L572.7188,45.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="590.25" y="43.6543">D</text>
@@ -115,31 +115,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="466" y="69.7104">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="710" y1="76.3047" y2="76.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="82.3047"/>
       <ellipse cx="457" cy="87.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="90.5151">add(int i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="97.1094" y2="97.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="103.1094"/>
       <ellipse cx="457" cy="108.1094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="466" y="111.3198">ints : B&lt;int,Vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
       <ellipse cx="838.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.4688,360.1406 Q840.8906,360.4375 840.25,360.5781 Q839.6094,360.7344 838.9063,360.7344 Q836.4063,360.7344 835.0781,359.0938 Q833.7656,357.4375 833.7656,354.3125 Q833.7656,351.1875 835.0781,349.5313 Q836.4063,347.875 838.9063,347.875 Q839.6094,347.875 840.25,348.0313 Q840.9063,348.1875 841.4688,348.4844 L841.4688,351.2031 Q840.8438,350.625 840.25,350.3594 Q839.6563,350.0781 839.0313,350.0781 Q837.6875,350.0781 837,351.1563 Q836.3125,352.2188 836.3125,354.3125 Q836.3125,356.4063 837,357.4844 Q837.6875,358.5469 839.0313,358.5469 Q839.6563,358.5469 840.25,358.2813 Q840.8438,358 841.4688,357.4219 L841.4688,360.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="852.5" y="358.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="370.5" y2="370.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="378.5" y2="378.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
       <ellipse cx="867" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M869.9688,231.6406 Q869.3906,231.9375 868.75,232.0781 Q868.1094,232.2344 867.4063,232.2344 Q864.9063,232.2344 863.5781,230.5938 Q862.2656,228.9375 862.2656,225.8125 Q862.2656,222.6875 863.5781,221.0313 Q864.9063,219.375 867.4063,219.375 Q868.1094,219.375 868.75,219.5313 Q869.4063,219.6875 869.9688,219.9844 L869.9688,222.7031 Q869.3438,222.125 868.75,221.8594 Q868.1563,221.5781 867.5313,221.5781 Q866.1875,221.5781 865.5,222.6563 Q864.8125,223.7188 864.8125,225.8125 Q864.8125,227.9063 865.5,228.9844 Q866.1875,230.0469 867.5313,230.0469 Q868.1563,230.0469 868.75,229.7813 Q869.3438,229.5 869.9688,228.9219 L869.9688,231.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="881" y="230.1543">E::nested_template</text>
@@ -147,16 +147,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="15" x="1012" y="219.1387">ET</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="242" y2="242"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="858" y="248"/>
       <ellipse cx="863" cy="253" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="98" x="872" y="256.2104">get(ET * d) : DT *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="262.8047" y2="262.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1391f4cwntkc7)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhrarnbviyuy1)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
       <ellipse cx="765.1" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M768.0688,61.6406 Q767.4906,61.9375 766.85,62.0781 Q766.2094,62.2344 765.5063,62.2344 Q763.0063,62.2344 761.6781,60.5938 Q760.3656,58.9375 760.3656,55.8125 Q760.3656,52.6875 761.6781,51.0313 Q763.0063,49.375 765.5063,49.375 Q766.2094,49.375 766.85,49.5313 Q767.5063,49.6875 768.0688,49.9844 L768.0688,52.7031 Q767.4438,52.125 766.85,51.8594 Q766.2563,51.5781 765.6313,51.5781 Q764.2875,51.5781 763.6,52.6563 Q762.9125,53.7188 762.9125,55.8125 Q762.9125,57.9063 763.6,58.9844 Q764.2875,60.0469 765.6313,60.0469 Q766.2563,60.0469 766.85,59.7813 Q767.4438,59.5 768.0688,58.9219 L768.0688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.9" y="60.1543">E::nested_template</text>
@@ -164,11 +164,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="914.5" y="49.1387">char</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="752.5" y="78"/>
       <ellipse cx="757.5" cy="83" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="168" x="766.5" y="86.2104">getDecl(char * c) : DeclType *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="92.8047" y2="92.8047"/>
diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg
index 51d49a31..cea158c5 100644
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1055.80078125 499" style="max-width: 1055.8px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1075.48046875 481" style="max-width: 1075.48px; background-color: white;" width="1075.48046875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,18 +50,20 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M618.796875,333L618.796875,340.5C618.796875,348,618.796875,363,618.796875,376.1666666666667C618.796875,389.3333333333333,618.796875,400.6666666666667,618.796875,406.3333333333333L618.796875,412"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M618.796875,333L618.796875,339C618.796875,345,618.796875,357,618.796875,367.1666666666667C618.796875,377.3333333333333,618.796875,385.6666666666667,618.796875,389.8333333333333L618.796875,394"/>
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M618.796875,164L618.796875,175.16666666666666C618.796875,186.33333333333334,618.796875,208.66666666666666,618.796875,227.33333333333334C618.796875,246,618.796875,261,618.796875,268.5L618.796875,276"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id3" d="M848.53125,344L848.53125,349.6666666666667C848.53125,355.3333333333333,848.53125,366.6666666666667,860.0865885416666,382.66968940654465C871.6419270833334,398.6727121464226,894.7526041666666,419.3454242928453,906.3079427083334,429.68178036605656L917.86328125,440.0181364392679"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id4" d="M955.957076848249,142L965.4420952902075,156.83333333333334C974.927113732166,171.66666666666666,993.897150616083,201.33333333333334,1003.3821690580415,228.41666666666666C1012.8671875,255.5,1012.8671875,280,1012.8671875,304.5C1012.8671875,329,1012.8671875,353.5,1001.3118489583334,376.08635607321133C989.7565104166666,398.6727121464226,966.6458333333334,419.3454242928453,955.0904947916666,429.68178036605656L943.53515625,440.0181364392679"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M905.441360651751,142L895.9563422097925,156.83333333333334C886.471323767834,171.66666666666666,867.501286883917,201.33333333333334,858.0162684419585,221.83333333333334C848.53125,242.33333333333334,848.53125,253.66666666666666,848.53125,259.3333333333333L848.53125,265"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M861.4921875,122.9321591019065L850.1770833333334,140.94346591825544C838.8619791666666,158.95477273460435,816.2317708333334,194.9773863673022,804.9166666666666,225.2386931836511C793.6015625,255.5,793.6015625,280,793.6015625,303C793.6015625,326,793.6015625,347.5,798.8164567183462,362.4166666666667C804.0313509366924,377.3333333333333,814.461139373385,385.6666666666667,819.6760335917312,389.8333333333333L824.8909278100775,394"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M887.1640625,124.18837639324053L897.6998697916666,141.99031366103378C908.2356770833334,159.79225092882703,929.3072916666666,195.39612546441353,939.8430989583334,218.86472939887344C950.37890625,242.33333333333334,950.37890625,253.66666666666666,950.37890625,259.3333333333333L950.37890625,265"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M950.37890625,344L950.37890625,348.1666666666667C950.37890625,352.3333333333333,950.37890625,360.6666666666667,945.4660650839793,369C940.5532239179587,377.3333333333333,930.7275415859173,385.6666666666667,925.8147004198967,389.8333333333333L920.901859253876,394"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -77,40 +79,42 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(848.53125, 378)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
-                </span>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(1012.8671875, 304.5)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
-                </span>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L9">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L9">
           <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
             <rect height="189" width="242.171875" y="-94.5" x="-121.0859375" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -159,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L20">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L20">
           <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
             <rect height="79" width="186.203125" y="-39.5" x="-93.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -183,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 451.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
             <rect height="79" width="209.328125" y="-39.5" x="-104.6640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -207,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
             <rect height="57" width="118.15625" y="-28.5" x="-59.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -226,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L28">
+        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L28">
           <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
             <rect height="123" width="164.84375" y="-61.5" x="-82.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="82.421875" x1="-82.421875" class="divider"/>
@@ -260,7 +264,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(930.69921875, 451.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L36">
+        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L36">
           <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -279,7 +283,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(848.53125, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L37">
+        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L37">
           <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
             <rect height="79" width="201.734375" y="-39.5" x="-100.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -303,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(930.69921875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00008/t00008.cc#L44">
+        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00008/t00008.cc#L44">
           <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
             <rect height="79" width="234.203125" y="-39.5" x="-117.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md
index d6360228..dc54e8ec 100644
--- a/docs/test_cases/t00009.md
+++ b/docs/test_cases/t00009.md
@@ -245,7 +245,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index 72c861d5..35e7fe25 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_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="351px" preserveAspectRatio="none" style="width:448px;height:351px;" version="1.1" viewBox="0 0 448 351" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lh1qdq5adqaz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fy3vmoyyz2uw7" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lh1qdq5adqaz)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy3vmoyyz2uw7)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
       <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="326"/>
       <ellipse cx="127.5" cy="331" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="334.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lh1qdq5adqaz)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy3vmoyyz2uw7)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lh1qdq5adqaz)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy3vmoyyz2uw7)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
       <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
@@ -46,8 +46,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lh1qdq5adqaz)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy3vmoyyz2uw7)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
       <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
@@ -56,33 +56,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lh1qdq5adqaz)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy3vmoyyz2uw7)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
       <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="54"/>
       <ellipse cx="36.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="62.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="66.8047"/>
       <ellipse cx="36.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="75.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="79.6094"/>
       <ellipse cx="36.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="87.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000001894387438043499-&gt;C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg
index baab15d2..49cb1ab8 100644
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 530.859375 393" style="max-width: 530.859px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 530.859375 393" style="max-width: 530.859px; background-color: white;" width="530.859375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -58,29 +58,35 @@
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,165C410,176.33333333333334,410,187.66666666666666,410,193.33333333333334L410,199"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -120,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
             <rect height="79" width="85.421875" y="-39.5" x="-42.7109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -144,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -163,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -182,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L7">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
             <rect height="57" width="225.71875" y="-28.5" x="-112.859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -201,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00009/t00009.cc#L12">
+        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00009/t00009.cc#L12">
           <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
             <rect height="123" width="295.59375" y="-61.5" x="-147.796875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="147.796875" x1="-147.796875" class="divider"/>
diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md
index cefeaf32..24296f4e 100644
--- a/docs/test_cases/t00010.md
+++ b/docs/test_cases/t00010.md
@@ -255,7 +255,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 1f81df81..b1af3869 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_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="586px" preserveAspectRatio="none" style="width:193px;height:586px;" version="1.1" viewBox="0 0 193 586" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fg3jeri29s5az" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fyio5umf5cylr" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3jeri29s5az)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyio5umf5cylr)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
       <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="548"/>
       <ellipse cx="60.5" cy="553" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="556.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="560.8047"/>
       <ellipse cx="60.5" cy="565.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="569.0151">second : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3jeri29s5az)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyio5umf5cylr)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
       <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
@@ -43,8 +43,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="425" y2="425"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3jeri29s5az)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyio5umf5cylr)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
       <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
@@ -53,15 +53,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="301"/>
       <ellipse cx="17" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="309.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3jeri29s5az)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyio5umf5cylr)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
       <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
@@ -70,19 +70,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3jeri29s5az)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyio5umf5cylr)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
       <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="54"/>
       <ellipse cx="37.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="62.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0001861520693741915300-&gt;C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg
index ca38fd41..1c45921a 100644
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 211.984375 625" style="max-width: 211.984px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 211.984375 625" style="max-width: 211.984px; background-color: white;" width="211.984375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -56,11 +56,13 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M105.9921875,87L105.9921875,92.66666666666667C105.9921875,98.33333333333333,105.9921875,109.66666666666667,105.9921875,121C105.9921875,132.33333333333334,105.9921875,143.66666666666666,105.9921875,149.33333333333334L105.9921875,155"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -76,11 +78,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -98,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
             <rect height="101" width="99.953125" y="-50.5" x="-49.9765625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -127,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -146,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
             <rect height="79" width="195.984375" y="-39.5" x="-97.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -170,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -189,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00010/t00010.cc#L18">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00010/t00010.cc#L18">
           <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
             <rect height="79" width="148.859375" y="-39.5" x="-74.4296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md
index 5de47443..508a7018 100644
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -214,7 +214,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 3f09cc83..b0fda56a 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_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="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1m5ffjszk6wwy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f16z2g5c2nc6ba" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m5ffjszk6wwy)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16z2g5c2nc6ba)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
       <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
@@ -19,48 +19,48 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="62.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m5ffjszk6wwy)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16z2g5c2nc6ba)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
       <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="46"/>
       <ellipse cx="127" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="54.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m5ffjszk6wwy)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16z2g5c2nc6ba)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
       <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
       <ellipse cx="127" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="192.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="204.8047"/>
       <ellipse cx="127" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="213.0151">m_a : A *</text>
     </a>
     <path d="M116.04,73.01 C105.09,85.59 97.85,100.6 103.5,116 C107.44,126.72 113.97,136.89 121.21,145.9 " fill="none" id="C_0001420516952857803719&lt;-C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg
index 6ce25e26..511eef8e 100644
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 247.34375 264" style="max-width: 247.344px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 252.29296875 264" style="max-width: 252.293px; background-color: white;" width="252.29296875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,22 +50,22 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M174.79761904761904,87L172.7063492063492,92.66666666666667C170.61507936507937,98.33333333333333,166.43253968253967,109.66666666666667,166.16030337184182,121C165.88806706114397,132.33333333333334,169.52613412228797,143.66666666666666,171.34516765285994,149.33333333333334L173.16420118343194,155"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M205.58579881656806,155L207.40483234714006,149.33333333333334C209.22386587771203,143.66666666666666,212.86193293885603,132.33333333333334,212.58969662815818,121C212.31746031746033,109.66666666666667,208.13492063492063,98.33333333333333,206.0436507936508,92.66666666666667L203.95238095238096,87"/>
+        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M170.73551764455783,87L168.0614990787982,92.66666666666667C165.38748051303855,98.33333333333333,160.03944338151928,109.66666666666667,159.69134629011862,121C159.34324919871793,132.33333333333334,163.99509214743588,143.66666666666666,166.32101362179486,149.33333333333334L168.64693509615384,155"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M210.10306490384616,155L212.4289863782051,149.33333333333334C214.75490785256412,143.66666666666666,219.40675080128207,132.33333333333334,219.05865370988138,121C218.71055661848072,109.66666666666667,213.36251948696145,98.33333333333333,210.6885009212018,92.66666666666667L208.01448235544217,87"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(162.25, 121)" class="edgeLabel">
-          <g transform="translate(-14.015625, -9)" class="label">
-            <foreignObject height="18" width="28.03125">
+        <g transform="translate(154.69140625, 121)" class="edgeLabel">
+          <g transform="translate(-29.1328125, -9)" class="label">
+            <foreignObject height="18" width="58.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">+&lt;&gt;</span>
+                  <span class="edgeLabel">+[friend]</span>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(216.5, 121)" class="edgeLabel">
+        <g transform="translate(224.05859375, 121)" class="edgeLabel">
           <g transform="translate(-20.234375, -9)" class="label">
             <foreignObject height="18" width="40.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L10">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L10">
           <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
             <rect height="79" width="81.40625" y="-39.5" x="-40.703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -102,7 +102,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L14">
+        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L14">
           <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
             <rect height="79" width="99.9375" y="-39.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -126,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00011/t00011.cc#L26">
+        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00011/t00011.cc#L26">
           <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md
index 5b9c0bf6..5a409d41 100644
--- a/docs/test_cases/t00012.md
+++ b/docs/test_cases/t00012.md
@@ -556,7 +556,7 @@ class R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index e1950354..edab9d6d 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_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="390px" preserveAspectRatio="none" style="width:1362px;height:390px;" version="1.1" viewBox="0 0 1362 390" width="1362px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x0jdha6vhghq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11qrfizw874jm" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
       <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="352"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="360.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="364.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="366.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="373.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
       <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
@@ -43,15 +43,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
       <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
@@ -60,15 +60,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
       <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
@@ -77,8 +77,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
       <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
       <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
@@ -97,8 +97,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
       <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
@@ -107,8 +107,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
@@ -117,50 +117,50 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x0jdha6vhghq)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11qrfizw874jm)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
       <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="62.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="75.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="87.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="100.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="113.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
     </a>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f1x0jdha6vhghq)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f11qrfizw874jm)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
     <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg
index 6f87bda8..a0652127 100644
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1342.828125 459" style="max-width: 1342.83px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1342.828125 459" style="max-width: 1342.83px; background-color: white;" width="1342.828125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -62,47 +62,57 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M806.0546875,155.30899127711922L845.95703125,164.25749273093268C885.859375,173.20599418474615,965.6640625,191.1029970923731,1005.56640625,205.71816521285322C1045.46875,220.33333333333334,1045.46875,231.66666666666666,1045.46875,237.33333333333334L1045.46875,243"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -164,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
             <rect height="101" width="206.203125" y="-50.5" x="-103.1015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -193,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
             <rect height="79" width="243.515625" y="-39.5" x="-121.7578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -217,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
             <rect height="79" width="234.625" y="-39.5" x="-117.3125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -241,7 +251,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
             <rect height="57" width="186.5625" y="-28.5" x="-93.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -260,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L11">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
             <rect height="57" width="186.546875" y="-28.5" x="-93.2734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -279,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
             <rect height="57" width="80.828125" y="-28.5" x="-40.4140625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -298,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L16">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
             <rect height="57" width="94.171875" y="-28.5" x="-47.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -317,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
             <rect height="57" width="578.71875" y="-28.5" x="-289.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -336,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00012/t00012.cc#L24">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00012/t00012.cc#L24">
           <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
             <rect height="167" width="569.0625" y="-83.5" x="-284.53125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.53125" x1="-284.53125" class="divider"/>
diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md
index 574aca69..64ad8575 100644
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -907,7 +907,7 @@ private:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 59a13c1b..3145c0ab 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_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="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvwg5bnkn1g01" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f2dbudet21r6v" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
       <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="486.5"/>
       <ellipse cx="172" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="494.7104">f : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
       <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
@@ -36,75 +36,75 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
       <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="351.5"/>
       <ellipse cx="380" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="359.7104">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
       <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="351.5"/>
       <ellipse cx="474" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="359.7104">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
       <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="351.5"/>
       <ellipse cx="568.5" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="359.7104">c : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
       <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
       <ellipse cx="17" cy="342" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="345.2104">print(R * r) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="357.8047"/>
       <ellipse cx="17" cy="362.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="366.0151">d : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
       <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
@@ -113,15 +113,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="486.5"/>
       <ellipse cx="806.5" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="494.7104">e : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
       <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
@@ -130,22 +130,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="474" y2="474"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="480"/>
       <ellipse cx="961.5" cy="485" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="488.2104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="492.8047"/>
       <ellipse cx="961.5" cy="497.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="501.0151">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
       <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
@@ -154,8 +154,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
       <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
@@ -164,8 +164,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
       <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
@@ -174,93 +174,93 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvwg5bnkn1g01)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2dbudet21r6v)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
       <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
       <ellipse cx="382.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="391.5" y="54.2104">get_a(A * a) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <ellipse cx="382.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="391.5" y="67.0151">get_b(B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="71.6094"/>
       <ellipse cx="382.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="391.5" y="79.8198">get_c(C c) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="84.4141"/>
       <ellipse cx="382.5" cy="89.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="391.5" y="92.6245">get_const_b(const B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="97.2188"/>
       <ellipse cx="382.5" cy="102.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="391.5" y="105.4292">get_d(D &amp;&amp; d) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="110.0234"/>
       <ellipse cx="382.5" cy="115.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="391.5" y="118.2339">get_d2(D &amp;&amp; d) : int</text>
     </a>
     <ellipse cx="382.5" cy="127.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="391.5" y="131.0386">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
     <ellipse cx="382.5" cy="140.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="168" x="391.5" y="143.8433">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="148.4375"/>
       <ellipse cx="382.5" cy="153.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="184" x="391.5" y="156.6479">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="161.2422"/>
       <ellipse cx="382.5" cy="166.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="391.5" y="169.4526">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="174.0469"/>
       <ellipse cx="382.5" cy="179.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="391.5" y="182.2573">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="188.8516" y2="188.8516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="194.8516"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="196.8516"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="203.062">estring : E&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="207.6563"/>
       <ellipse cx="382.5" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="215.8667">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
     <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0002304215469403389354-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg
index 8cb4717f..45d31678 100644
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1083.6953125 808" style="max-width: 1083.7px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1083.6953125 808" style="max-width: 1083.7px; background-color: white;" width="1083.6953125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -67,119 +67,145 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,502L523.1875,507.6666666666667C523.1875,513.3333333333334,523.1875,524.6666666666666,523.1875,537.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -208,7 +234,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
             <rect height="79" width="110.109375" y="-39.5" x="-55.0546875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -232,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L7">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
             <rect height="57" width="119.890625" y="-28.5" x="-59.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -251,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L14">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L14">
           <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -275,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L18">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L18">
           <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -299,7 +325,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L22">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L22">
           <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
             <rect height="79" width="62.578125" y="-39.5" x="-31.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -323,7 +349,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L28">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L28">
           <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
             <rect height="101" width="140.8125" y="-50.5" x="-70.40625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.40625" x1="-70.40625" class="divider"/>
@@ -352,7 +378,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -376,7 +402,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -405,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -424,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
             <rect height="57" width="187.453125" y="-28.5" x="-93.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -443,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
             <rect height="57" width="123.46875" y="-28.5" x="-61.734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -462,7 +488,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00013/t00013.cc#L43">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00013/t00013.cc#L43">
           <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
             <rect height="343" width="259.125" y="-171.5" x="-129.5625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="129.5625" x1="-129.5625" class="divider"/>
diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md
index c75fbbee..1b21783a 100644
--- a/docs/test_cases/t00014.md
+++ b/docs/test_cases/t00014.md
@@ -974,7 +974,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index a0c1c38c..65767a96 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_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="1146px" preserveAspectRatio="none" style="width:1085px;height:1146px;" version="1.1" viewBox="0 0 1085 1146" width="1085px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ushu61zdr779" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1i244lkcuildr" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="593"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="593"/>
       <ellipse cx="1024" cy="609" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1026.9688,614.6406 Q1026.3906,614.9375 1025.75,615.0781 Q1025.1094,615.2344 1024.4063,615.2344 Q1021.9063,615.2344 1020.5781,613.5938 Q1019.2656,611.9375 1019.2656,608.8125 Q1019.2656,605.6875 1020.5781,604.0313 Q1021.9063,602.375 1024.4063,602.375 Q1025.1094,602.375 1025.75,602.5313 Q1026.4063,602.6875 1026.9688,602.9844 L1026.9688,605.7031 Q1026.3438,605.125 1025.75,604.8594 Q1025.1563,604.5781 1024.5313,604.5781 Q1023.1875,604.5781 1022.5,605.6563 Q1021.8125,606.7188 1021.8125,608.8125 Q1021.8125,610.9063 1022.5,611.9844 Q1023.1875,613.0469 1024.5313,613.0469 Q1025.1563,613.0469 1025.75,612.7813 Q1026.3438,612.5 1026.9688,611.9219 L1026.9688,614.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1038" y="613.1543">A</text>
@@ -19,37 +19,37 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="625" y2="625"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="633" y2="633"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="639"/>
       <ellipse cx="1020" cy="644" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1029" y="647.2104">p : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="651.8047"/>
       <ellipse cx="1020" cy="656.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1029" y="660.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="53.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="53.5"/>
       <ellipse cx="521.75" cy="69.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M524.7188,75.1406 Q524.1406,75.4375 523.5,75.5781 Q522.8594,75.7344 522.1563,75.7344 Q519.6563,75.7344 518.3281,74.0938 Q517.0156,72.4375 517.0156,69.3125 Q517.0156,66.1875 518.3281,64.5313 Q519.6563,62.875 522.1563,62.875 Q522.8594,62.875 523.5,63.0313 Q524.1563,63.1875 524.7188,63.4844 L524.7188,66.2031 Q524.0938,65.625 523.5,65.3594 Q522.9063,65.0781 522.2813,65.0781 Q520.9375,65.0781 520.25,66.1563 Q519.5625,67.2188 519.5625,69.3125 Q519.5625,71.4063 520.25,72.4844 Q520.9375,73.5469 522.2813,73.5469 Q522.9063,73.5469 523.5,73.2813 Q524.0938,73 524.7188,72.4219 L524.7188,75.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.25" y="73.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="85.5" y2="85.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="93.5" y2="93.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="472.5" y="99.5"/>
       <ellipse cx="477.5" cy="104.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="486.5" y="107.7104">value : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="874"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="874"/>
       <ellipse cx="789" cy="890" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M791.9688,895.6406 Q791.3906,895.9375 790.75,896.0781 Q790.1094,896.2344 789.4063,896.2344 Q786.9063,896.2344 785.5781,894.5938 Q784.2656,892.9375 784.2656,889.8125 Q784.2656,886.6875 785.5781,885.0313 Q786.9063,883.375 789.4063,883.375 Q790.1094,883.375 790.75,883.5313 Q791.4063,883.6875 791.9688,883.9844 L791.9688,886.7031 Q791.3438,886.125 790.75,885.8594 Q790.1563,885.5781 789.5313,885.5781 Q788.1875,885.5781 787.5,886.6563 Q786.8125,887.7188 786.8125,889.8125 Q786.8125,891.9063 787.5,892.9844 Q788.1875,894.0469 789.5313,894.0469 Q790.1563,894.0469 790.75,893.7813 Q791.3438,893.5 791.9688,892.9219 L791.9688,895.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="803" y="894.1543">A</text>
@@ -58,8 +58,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="906" y2="906"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="914" y2="914"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="657"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="657"/>
       <ellipse cx="732" cy="673" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M734.9688,678.6406 Q734.3906,678.9375 733.75,679.0781 Q733.1094,679.2344 732.4063,679.2344 Q729.9063,679.2344 728.5781,677.5938 Q727.2656,675.9375 727.2656,672.8125 Q727.2656,669.6875 728.5781,668.0313 Q729.9063,666.375 732.4063,666.375 Q733.1094,666.375 733.75,666.5313 Q734.4063,666.6875 734.9688,666.9844 L734.9688,669.7031 Q734.3438,669.125 733.75,668.8594 Q733.1563,668.5781 732.5313,668.5781 Q731.1875,668.5781 730.5,669.6563 Q729.8125,670.7188 729.8125,672.8125 Q729.8125,674.9063 730.5,675.9844 Q731.1875,677.0469 732.5313,677.0469 Q733.1563,677.0469 733.75,676.7813 Q734.3438,676.5 734.9688,675.9219 L734.9688,678.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="746" y="677.1543">A</text>
@@ -68,8 +68,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="689" y2="689"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="697" y2="697"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="533"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="533"/>
       <ellipse cx="806.5" cy="549" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M809.4688,554.6406 Q808.8906,554.9375 808.25,555.0781 Q807.6094,555.2344 806.9063,555.2344 Q804.4063,555.2344 803.0781,553.5938 Q801.7656,551.9375 801.7656,548.8125 Q801.7656,545.6875 803.0781,544.0313 Q804.4063,542.375 806.9063,542.375 Q807.6094,542.375 808.25,542.5313 Q808.9063,542.6875 809.4688,542.9844 L809.4688,545.7031 Q808.8438,545.125 808.25,544.8594 Q807.6563,544.5781 807.0313,544.5781 Q805.6875,544.5781 805,545.6563 Q804.3125,546.7188 804.3125,548.8125 Q804.3125,550.9063 805,551.9844 Q805.6875,553.0469 807.0313,553.0469 Q807.6563,553.0469 808.25,552.7813 Q808.8438,552.5 809.4688,551.9219 L809.4688,554.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="553.1543">A</text>
@@ -78,8 +78,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="565" y2="565"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="573" y2="573"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="299"/>
       <ellipse cx="798.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M801.4688,320.6406 Q800.8906,320.9375 800.25,321.0781 Q799.6094,321.2344 798.9063,321.2344 Q796.4063,321.2344 795.0781,319.5938 Q793.7656,317.9375 793.7656,314.8125 Q793.7656,311.6875 795.0781,310.0313 Q796.4063,308.375 798.9063,308.375 Q799.6094,308.375 800.25,308.5313 Q800.9063,308.6875 801.4688,308.9844 L801.4688,311.7031 Q800.8438,311.125 800.25,310.8594 Q799.6563,310.5781 799.0313,310.5781 Q797.6875,310.5781 797,311.6563 Q796.3125,312.7188 796.3125,314.8125 Q796.3125,316.9063 797,317.9844 Q797.6875,319.0469 799.0313,319.0469 Q799.6563,319.0469 800.25,318.7813 Q800.8438,318.5 801.4688,317.9219 L801.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.5" y="319.1543">A</text>
@@ -88,8 +88,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="589"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="589"/>
       <ellipse cx="503" cy="605" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M505.9688,610.6406 Q505.3906,610.9375 504.75,611.0781 Q504.1094,611.2344 503.4063,611.2344 Q500.9063,611.2344 499.5781,609.5938 Q498.2656,607.9375 498.2656,604.8125 Q498.2656,601.6875 499.5781,600.0313 Q500.9063,598.375 503.4063,598.375 Q504.1094,598.375 504.75,598.5313 Q505.4063,598.6875 505.9688,598.9844 L505.9688,601.7031 Q505.3438,601.125 504.75,600.8594 Q504.1563,600.5781 503.5313,600.5781 Q502.1875,600.5781 501.5,601.6563 Q500.8125,602.7188 500.8125,604.8125 Q500.8125,606.9063 501.5,607.9844 Q502.1875,609.0469 503.5313,609.0469 Q504.1563,609.0469 504.75,608.7813 Q505.3438,608.5 505.9688,607.9219 L505.9688,610.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="517" y="609.1543">A</text>
@@ -98,8 +98,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="621" y2="621"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="629" y2="629"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="506"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="506"/>
       <ellipse cx="494" cy="522" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.9688,527.6406 Q496.3906,527.9375 495.75,528.0781 Q495.1094,528.2344 494.4063,528.2344 Q491.9063,528.2344 490.5781,526.5938 Q489.2656,524.9375 489.2656,521.8125 Q489.2656,518.6875 490.5781,517.0313 Q491.9063,515.375 494.4063,515.375 Q495.1094,515.375 495.75,515.5313 Q496.4063,515.6875 496.9688,515.9844 L496.9688,518.7031 Q496.3438,518.125 495.75,517.8594 Q495.1563,517.5781 494.5313,517.5781 Q493.1875,517.5781 492.5,518.6563 Q491.8125,519.7188 491.8125,521.8125 Q491.8125,523.9063 492.5,524.9844 Q493.1875,526.0469 494.5313,526.0469 Q495.1563,526.0469 495.75,525.7813 Q496.3438,525.5 496.9688,524.9219 L496.9688,527.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508" y="526.1543">A</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="538" y2="538"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="546" y2="546"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="257"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="257"/>
       <ellipse cx="486" cy="273" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.9688,278.6406 Q488.3906,278.9375 487.75,279.0781 Q487.1094,279.2344 486.4063,279.2344 Q483.9063,279.2344 482.5781,277.5938 Q481.2656,275.9375 481.2656,272.8125 Q481.2656,269.6875 482.5781,268.0313 Q483.9063,266.375 486.4063,266.375 Q487.1094,266.375 487.75,266.5313 Q488.4063,266.6875 488.9688,266.9844 L488.9688,269.7031 Q488.3438,269.125 487.75,268.8594 Q487.1563,268.5781 486.5313,268.5781 Q485.1875,268.5781 484.5,269.6563 Q483.8125,270.7188 483.8125,272.8125 Q483.8125,274.9063 484.5,275.9844 Q485.1875,277.0469 486.5313,277.0469 Q487.1563,277.0469 487.75,276.7813 Q488.3438,276.5 488.9688,275.9219 L488.9688,278.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="500" y="277.1543">A</text>
@@ -118,8 +118,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="289" y2="289"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="423"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="423"/>
       <ellipse cx="493.5" cy="439" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.4688,444.6406 Q495.8906,444.9375 495.25,445.0781 Q494.6094,445.2344 493.9063,445.2344 Q491.4063,445.2344 490.0781,443.5938 Q488.7656,441.9375 488.7656,438.8125 Q488.7656,435.6875 490.0781,434.0313 Q491.4063,432.375 493.9063,432.375 Q494.6094,432.375 495.25,432.5313 Q495.9063,432.6875 496.4688,432.9844 L496.4688,435.7031 Q495.8438,435.125 495.25,434.8594 Q494.6563,434.5781 494.0313,434.5781 Q492.6875,434.5781 492,435.6563 Q491.3125,436.7188 491.3125,438.8125 Q491.3125,440.9063 492,441.9844 Q492.6875,443.0469 494.0313,443.0469 Q494.6563,443.0469 495.25,442.7813 Q495.8438,442.5 496.4688,441.9219 L496.4688,444.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="507.5" y="443.1543">A</text>
@@ -128,8 +128,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="455" y2="455"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="463" y2="463"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/shared_ptr.h#L122" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/shared_ptr.h#L122" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="340"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/shared_ptr.h#L122" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/shared_ptr.h#L122" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="340"/>
       <ellipse cx="485.5" cy="356" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.4688,361.6406 Q487.8906,361.9375 487.25,362.0781 Q486.6094,362.2344 485.9063,362.2344 Q483.4063,362.2344 482.0781,360.5938 Q480.7656,358.9375 480.7656,355.8125 Q480.7656,352.6875 482.0781,351.0313 Q483.4063,349.375 485.9063,349.375 Q486.6094,349.375 487.25,349.5313 Q487.9063,349.6875 488.4688,349.9844 L488.4688,352.7031 Q487.8438,352.125 487.25,351.8594 Q486.6563,351.5781 486.0313,351.5781 Q484.6875,351.5781 484,352.6563 Q483.3125,353.7188 483.3125,355.8125 Q483.3125,357.9063 484,358.9844 Q484.6875,360.0469 486.0313,360.0469 Q486.6563,360.0469 487.25,359.7813 Q487.8438,359.5 488.4688,358.9219 L488.4688,361.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="499.5" y="360.1543">A</text>
@@ -138,8 +138,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="372" y2="372"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="380" y2="380"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="755"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="755"/>
       <ellipse cx="476.5" cy="771" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M479.4688,776.6406 Q478.8906,776.9375 478.25,777.0781 Q477.6094,777.2344 476.9063,777.2344 Q474.4063,777.2344 473.0781,775.5938 Q471.7656,773.9375 471.7656,770.8125 Q471.7656,767.6875 473.0781,766.0313 Q474.4063,764.375 476.9063,764.375 Q477.6094,764.375 478.25,764.5313 Q478.9063,764.6875 479.4688,764.9844 L479.4688,767.7031 Q478.8438,767.125 478.25,766.8594 Q477.6563,766.5781 477.0313,766.5781 Q475.6875,766.5781 475,767.6563 Q474.3125,768.7188 474.3125,770.8125 Q474.3125,772.9063 475,773.9844 Q475.6875,775.0469 477.0313,775.0469 Q477.6563,775.0469 478.25,774.7813 Q478.8438,774.5 479.4688,773.9219 L479.4688,776.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490.5" y="775.1543">A</text>
@@ -148,8 +148,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="787" y2="787"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="795" y2="795"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="672"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="672"/>
       <ellipse cx="419" cy="688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M421.9688,693.6406 Q421.3906,693.9375 420.75,694.0781 Q420.1094,694.2344 419.4063,694.2344 Q416.9063,694.2344 415.5781,692.5938 Q414.2656,690.9375 414.2656,687.8125 Q414.2656,684.6875 415.5781,683.0313 Q416.9063,681.375 419.4063,681.375 Q420.1094,681.375 420.75,681.5313 Q421.4063,681.6875 421.9688,681.9844 L421.9688,684.7031 Q421.3438,684.125 420.75,683.8594 Q420.1563,683.5781 419.5313,683.5781 Q418.1875,683.5781 417.5,684.6563 Q416.8125,685.7188 416.8125,687.8125 Q416.8125,689.9063 417.5,690.9844 Q418.1875,692.0469 419.5313,692.0469 Q420.1563,692.0469 420.75,691.7813 Q421.3438,691.5 421.9688,690.9219 L421.9688,693.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="692.1543">A</text>
@@ -158,8 +158,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="704" y2="704"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="712" y2="712"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="921"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="921"/>
       <ellipse cx="482" cy="937" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M484.9688,942.6406 Q484.3906,942.9375 483.75,943.0781 Q483.1094,943.2344 482.4063,943.2344 Q479.9063,943.2344 478.5781,941.5938 Q477.2656,939.9375 477.2656,936.8125 Q477.2656,933.6875 478.5781,932.0313 Q479.9063,930.375 482.4063,930.375 Q483.1094,930.375 483.75,930.5313 Q484.4063,930.6875 484.9688,930.9844 L484.9688,933.7031 Q484.3438,933.125 483.75,932.8594 Q483.1563,932.5781 482.5313,932.5781 Q481.1875,932.5781 480.5,933.6563 Q479.8125,934.7188 479.8125,936.8125 Q479.8125,938.9063 480.5,939.9844 Q481.1875,941.0469 482.5313,941.0469 Q483.1563,941.0469 483.75,940.7813 Q484.3438,940.5 484.9688,939.9219 L484.9688,942.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="941.1543">A</text>
@@ -168,8 +168,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="953" y2="953"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="961" y2="961"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1004"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1004"/>
       <ellipse cx="459" cy="1020" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M461.9688,1025.6406 Q461.3906,1025.9375 460.75,1026.0781 Q460.1094,1026.2344 459.4063,1026.2344 Q456.9063,1026.2344 455.5781,1024.5938 Q454.2656,1022.9375 454.2656,1019.8125 Q454.2656,1016.6875 455.5781,1015.0313 Q456.9063,1013.375 459.4063,1013.375 Q460.1094,1013.375 460.75,1013.5313 Q461.4063,1013.6875 461.9688,1013.9844 L461.9688,1016.7031 Q461.3438,1016.125 460.75,1015.8594 Q460.1563,1015.5781 459.5313,1015.5781 Q458.1875,1015.5781 457.5,1016.6563 Q456.8125,1017.7188 456.8125,1019.8125 Q456.8125,1021.9063 457.5,1022.9844 Q458.1875,1024.0469 459.5313,1024.0469 Q460.1563,1024.0469 460.75,1023.7813 Q461.3438,1023.5 461.9688,1022.9219 L461.9688,1025.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="473" y="1024.1543">A</text>
@@ -178,8 +178,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1036" y2="1036"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1044" y2="1044"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1087"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1087"/>
       <ellipse cx="476" cy="1103" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M478.9688,1108.6406 Q478.3906,1108.9375 477.75,1109.0781 Q477.1094,1109.2344 476.4063,1109.2344 Q473.9063,1109.2344 472.5781,1107.5938 Q471.2656,1105.9375 471.2656,1102.8125 Q471.2656,1099.6875 472.5781,1098.0313 Q473.9063,1096.375 476.4063,1096.375 Q477.1094,1096.375 477.75,1096.5313 Q478.4063,1096.6875 478.9688,1096.9844 L478.9688,1099.7031 Q478.3438,1099.125 477.75,1098.8594 Q477.1563,1098.5781 476.5313,1098.5781 Q475.1875,1098.5781 474.5,1099.6563 Q473.8125,1100.7188 473.8125,1102.8125 Q473.8125,1104.9063 474.5,1105.9844 Q475.1875,1107.0469 476.5313,1107.0469 Q477.1563,1107.0469 477.75,1106.7813 Q478.3438,1106.5 478.9688,1105.9219 L478.9688,1108.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490" y="1107.1543">A</text>
@@ -188,8 +188,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1119" y2="1119"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1127" y2="1127"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="838"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="838"/>
       <ellipse cx="465.5" cy="854" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M468.4688,859.6406 Q467.8906,859.9375 467.25,860.0781 Q466.6094,860.2344 465.9063,860.2344 Q463.4063,860.2344 462.0781,858.5938 Q460.7656,856.9375 460.7656,853.8125 Q460.7656,850.6875 462.0781,849.0313 Q463.4063,847.375 465.9063,847.375 Q466.6094,847.375 467.25,847.5313 Q467.9063,847.6875 468.4688,847.9844 L468.4688,850.7031 Q467.8438,850.125 467.25,849.8594 Q466.6563,849.5781 466.0313,849.5781 Q464.6875,849.5781 464,850.6563 Q463.3125,851.7188 463.3125,853.8125 Q463.3125,855.9063 464,856.9844 Q464.6875,858.0469 466.0313,858.0469 Q466.6563,858.0469 467.25,857.7813 Q467.8438,857.5 468.4688,856.9219 L468.4688,859.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.5" y="858.1543">A</text>
@@ -198,8 +198,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="870" y2="870"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="878" y2="878"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ushu61zdr779)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="349.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i244lkcuildr)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="349.5"/>
       <ellipse cx="114.25" cy="365.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.2188,371.1406 Q116.6406,371.4375 116,371.5781 Q115.3594,371.7344 114.6563,371.7344 Q112.1563,371.7344 110.8281,370.0938 Q109.5156,368.4375 109.5156,365.3125 Q109.5156,362.1875 110.8281,360.5313 Q112.1563,358.875 114.6563,358.875 Q115.3594,358.875 116,359.0313 Q116.6563,359.1875 117.2188,359.4844 L117.2188,362.2031 Q116.5938,361.625 116,361.3594 Q115.4063,361.0781 114.7813,361.0781 Q113.4375,361.0781 112.75,362.1563 Q112.0625,363.2188 112.0625,365.3125 Q112.0625,367.4063 112.75,368.4844 Q113.4375,369.5469 114.7813,369.5469 Q115.4063,369.5469 116,369.2813 Q116.5938,369 117.2188,368.4219 L117.2188,371.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="134.75" y="369.6543">R</text>
@@ -208,116 +208,116 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="381.5" y2="381.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="389.5" y2="389.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="395.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="397.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="403.7104">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="408.3047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="410.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="416.5151">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="421.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="423.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="429.3198">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="433.9141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="435.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="132" x="26" y="442.1245">atfloat : AAPtr&lt;T,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="446.7188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="448.7188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="454.9292">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="459.5234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="461.5234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="467.7339">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="472.3281"/>
       <polygon fill="none" points="17,472.3281,21,476.3281,17,480.3281,13,476.3281" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="480.5386">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="485.1328"/>
       <ellipse cx="17" cy="490.1328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="493.3433">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="497.9375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="499.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="506.1479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="510.7422"/>
       <ellipse cx="17" cy="515.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="518.9526">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="523.5469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="525.5469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="531.7573">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="536.3516"/>
       <ellipse cx="17" cy="541.3516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="26" y="544.562">gcb : GenericCallback&lt;AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="549.1563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="551.1563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="557.3667">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="561.9609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="563.9609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="570.1714">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="574.7656"/>
       <ellipse cx="17" cy="579.7656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="582.9761">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="587.5703"/>
       <ellipse cx="17" cy="592.5703" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="595.7808">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <path d="M852.1,873.74 C884.92,830.94 953.84,741.07 998.19,683.23 " fill="none" id="C_0002186387853087008570-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg
index 802d0c05..34fb5f98 100644
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1199.421875 1349.5" style="max-width: 1199.42px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1199.421875 1349.5" style="max-width: 1199.42px; background-color: white;" width="1199.421875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -85,137 +85,167 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id33" d="M263.2544964677047,360L282.7862991397539,321.8333333333333C302.31810181180316,283.6666666666667,341.38170715590155,207.33333333333334,385.56064524461743,162.57267606631714C429.7395833333333,117.81201879930093,479.0338541666667,104.62403759860187,503.6809895833333,98.03004699825232L528.328125,91.43605639790279"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -385,20 +415,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -416,7 +450,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
             <rect height="101" width="68.359375" y="-50.5" x="-34.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -445,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L26">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L26">
           <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
             <rect height="79" width="145.296875" y="-39.5" x="-72.6484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -469,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -488,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
             <rect height="57" width="272.796875" y="-28.5" x="-136.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -507,7 +541,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
           <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
             <rect height="57" width="93.234375" y="-28.5" x="-46.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -526,7 +560,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
           <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -545,7 +579,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
           <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
             <rect height="57" width="95.015625" y="-28.5" x="-47.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -564,7 +598,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
           <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
             <rect height="57" width="117.21875" y="-28.5" x="-58.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -583,7 +617,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
           <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
             <rect height="57" width="135.890625" y="-28.5" x="-67.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -602,7 +636,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/stl_iterator.h#L2488">
           <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
             <rect height="57" width="117.234375" y="-28.5" x="-58.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -621,7 +655,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/shared_ptr.h#L122">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/shared_ptr.h#L122">
           <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
             <rect height="57" width="135.90625" y="-28.5" x="-67.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -640,7 +674,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
             <rect height="57" width="162.5625" y="-28.5" x="-81.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -659,7 +693,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
             <rect height="57" width="298.578125" y="-28.5" x="-149.2890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -678,7 +712,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
             <rect height="57" width="148.34375" y="-28.5" x="-74.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -697,7 +731,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
             <rect height="57" width="207.890625" y="-28.5" x="-103.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -716,7 +750,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111">
           <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
             <rect height="57" width="161.703125" y="-28.5" x="-80.8515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -735,7 +769,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/std_function.h#L111">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/std_function.h#L111">
           <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -754,7 +788,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00014/t00014.cc#L56">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00014/t00014.cc#L56">
           <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
             <rect height="409" width="301.203125" y="-204.5" x="-150.6015625" class="outer title-state"/>
             <line y2="-174.5" y1="-174.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md
index 206a036d..7d271daf 100644
--- a/docs/test_cases/t00015.md
+++ b/docs/test_cases/t00015.md
@@ -189,7 +189,7 @@ class B : public ns1::ns2::Anon { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 793a44fa..6b7826d8 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_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="283px" preserveAspectRatio="none" style="width:365px;height:283px;" version="1.1" viewBox="0 0 365 283" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbnf4dzc3oxln" width="300%" x="-1" y="-1">
+    <filter height="300%" id="foifqh0lfcsmn" 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"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbnf4dzc3oxln)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foifqh0lfcsmn)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
       <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbnf4dzc3oxln)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foifqh0lfcsmn)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
       <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbnf4dzc3oxln)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foifqh0lfcsmn)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" 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="63" x="35" y="136.1543">ns1::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbnf4dzc3oxln)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foifqh0lfcsmn)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
       <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbnf4dzc3oxln)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foifqh0lfcsmn)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
       <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg
index 9e34b027..0eb06101 100644
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.91015625 287" style="max-width: 401.91px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.91015625 287" style="max-width: 401.91px; background-color: white;" width="401.91015625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -84,7 +84,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L6">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L6">
           <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L10">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L10">
           <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
             <rect height="57" width="165.296875" y="-28.5" x="-82.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L14">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L14">
           <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
             <rect height="57" width="94.109375" y="-28.5" x="-47.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -141,7 +141,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L21">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L21">
           <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
             <rect height="57" width="170.5625" y="-28.5" x="-85.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -160,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00015/t00015.cc#L24">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00015/t00015.cc#L24">
           <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md
index 301d2d9e..4d390c9a 100644
--- a/docs/test_cases/t00016.md
+++ b/docs/test_cases/t00016.md
@@ -275,7 +275,7 @@ template <> struct is_numeric<bool> {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index 5951fc48..31ad6bc7 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_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="200px" preserveAspectRatio="none" style="width:847px;height:200px;" version="1.1" viewBox="0 0 847 200" width="847px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fg6vv9aiayvbh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mzhit29u928d" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
       <ellipse cx="358.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.4688,150.6406 Q360.8906,150.9375 360.25,151.0781 Q359.6094,151.2344 358.9063,151.2344 Q356.4063,151.2344 355.0781,149.5938 Q353.7656,147.9375 353.7656,144.8125 Q353.7656,141.6875 355.0781,140.0313 Q356.4063,138.375 358.9063,138.375 Q359.6094,138.375 360.25,138.5313 Q360.9063,138.6875 361.4688,138.9844 L361.4688,141.7031 Q360.8438,141.125 360.25,140.8594 Q359.6563,140.5781 359.0313,140.5781 Q357.6875,140.5781 357,141.6563 Q356.3125,142.7188 356.3125,144.8125 Q356.3125,146.9063 357,147.9844 Q357.6875,149.0469 359.0313,149.0469 Q359.6563,149.0469 360.25,148.7813 Q360.8438,148.5 361.4688,147.9219 L361.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="372.5" y="149.1543">is_numeric</text>
@@ -21,8 +21,8 @@
       <ellipse cx="354.5" cy="180" 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="74" x="363.5" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
@@ -33,8 +33,8 @@
       <ellipse cx="17" cy="59" 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="74" x="26" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
       <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
@@ -45,8 +45,8 @@
       <ellipse cx="182" cy="59" 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="74" x="191" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
       <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
@@ -57,8 +57,8 @@
       <ellipse cx="347.5" cy="59" 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="74" x="356.5" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
       <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
@@ -69,8 +69,8 @@
       <ellipse cx="562" cy="59" 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="74" x="571" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg6vv9aiayvbh)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzhit29u928d)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
       <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg
index 8c53c83c..b57ce00c 100644
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1022.859375 224" style="max-width: 1022.86px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1022.859375 224" style="max-width: 1022.86px; background-color: white;" width="1022.859375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -57,54 +57,64 @@
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M938.890625,87L938.890625,91.16666666666667C938.890625,95.33333333333333,938.890625,103.66666666666667,884.9088541666666,116.11691944537377C830.9270833333334,128.56717222408088,722.9635416666666,145.13434444816178,668.9817708333334,153.41793056020222L615,161.70151667224266"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L4">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L4">
           <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
             <rect height="79" width="192.875" y="-39.5" x="-96.4375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -128,7 +138,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L8">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L8">
           <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
             <rect height="79" width="151.953125" y="-39.5" x="-75.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -152,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L12">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L12">
           <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
             <rect height="79" width="151.96875" y="-39.5" x="-75.984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -176,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L16">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L16">
           <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
             <rect height="79" width="213.28125" y="-39.5" x="-106.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -200,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L20">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L20">
           <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
             <rect height="79" width="137.71875" y="-39.5" x="-68.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -224,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00016/t00016.cc#L24">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00016/t00016.cc#L24">
           <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
             <rect height="79" width="151.9375" y="-39.5" x="-75.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.96875" x1="-75.96875" class="divider"/>
diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md
index 3f89805b..98b5b270 100644
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -579,7 +579,7 @@ private:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 48ae2fb9..1d899dc8 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_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="256px" preserveAspectRatio="none" style="width:799px;height:256px;" version="1.1" viewBox="0 0 799 256" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15epyqpufhuui" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fua0oia9cygma" 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"/>
@@ -9,135 +9,135 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
       <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
       <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
       <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
       <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
       <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
       <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
       <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
       <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
       <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
       <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15epyqpufhuui)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua0oia9cygma)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="353" x="233.5" y="54.2104">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="233.5" y="75.0151">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="233.5" y="87.8198">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="233.5" y="100.6245">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="233.5" y="113.4292">some_int_reference : int &amp;</text>
     </a>
     <path d="M227.33,124.78 C173.51,145.32 114.85,170.01 63,197 C57.36,199.93 51.44,203.42 46.03,206.78 " fill="none" id="C_0000287495916564113342&lt;-C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg
index 2034f400..7aaa99b8 100644
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 308" style="max-width: 796.641px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 308" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L5">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L5">
           <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L7">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L7">
           <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L9">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L9">
           <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L11">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L11">
           <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L13">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L13">
           <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L15">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L15">
           <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L17">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L17">
           <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L19">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L19">
           <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L21">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L21">
           <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L23">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L23">
           <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L25">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L25">
           <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00017/t00017.cc#L27">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00017/t00017.cc#L27">
           <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
             <rect height="167" width="445.96875" y="-83.5" x="-222.984375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="222.984375" x1="-222.984375" class="divider"/>
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index 9869b572..d5cd987d 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -556,7 +556,7 @@ void widget::draw(const clanguml::t00018::widget &w)
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index f615c215..330371d7 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_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="395px" preserveAspectRatio="none" style="width:317px;height:395px;" version="1.1" viewBox="0 0 317 395" width="317px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1w3xfs16h7zzg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15a1qdqti6ub0" 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"/>
@@ -9,121 +9,121 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w3xfs16h7zzg)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15a1qdqti6ub0)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
       <ellipse cx="114.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.7188,29.6406 Q117.1406,29.9375 116.5,30.0781 Q115.8594,30.2344 115.1563,30.2344 Q112.6563,30.2344 111.3281,28.5938 Q110.0156,26.9375 110.0156,23.8125 Q110.0156,20.6875 111.3281,19.0313 Q112.6563,17.375 115.1563,17.375 Q115.8594,17.375 116.5,17.5313 Q117.1563,17.6875 117.7188,17.9844 L117.7188,20.7031 Q117.0938,20.125 116.5,19.8594 Q115.9063,19.5781 115.2813,19.5781 Q113.9375,19.5781 113.25,20.6563 Q112.5625,21.7188 112.5625,23.8125 Q112.5625,25.9063 113.25,26.9844 Q113.9375,28.0469 115.2813,28.0469 Q115.9063,28.0469 116.5,27.7813 Q117.0938,27.5 117.7188,26.9219 L117.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="135.25" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="46"/>
       <ellipse cx="51.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="60.5" y="54.2104">widget(int n) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="41.5" x2="270.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="66.8047"/>
       <ellipse cx="51.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="205" x="60.5" y="75.0151">draw(const widget &amp; w) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="79.6094"/>
       <ellipse cx="51.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="60.5" y="87.8198">draw(const widget &amp; w) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="100.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="102.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="60.5" y="108.6245">n : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w3xfs16h7zzg)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15a1qdqti6ub0)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
       <ellipse cx="131.25" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.2188,213.6406 Q133.6406,213.9375 133,214.0781 Q132.3594,214.2344 131.6563,214.2344 Q129.1563,214.2344 127.8281,212.5938 Q126.5156,210.9375 126.5156,207.8125 Q126.5156,204.6875 127.8281,203.0313 Q129.1563,201.375 131.6563,201.375 Q132.3594,201.375 133,201.5313 Q133.6563,201.6875 134.2188,201.9844 L134.2188,204.7031 Q133.5938,204.125 133,203.8594 Q132.4063,203.5781 131.7813,203.5781 Q130.4375,203.5781 129.75,204.6563 Q129.0625,205.7188 129.0625,207.8125 Q129.0625,209.9063 129.75,210.9844 Q130.4375,212.0469 131.7813,212.0469 Q132.4063,212.0469 133,211.7813 Q133.5938,211.5 134.2188,210.9219 L134.2188,213.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="151.75" y="212.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230"/>
       <ellipse cx="17" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="238.2104">widget(int) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="242.8047"/>
       <ellipse cx="17" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="26" y="251.0151">widget(widget &amp;&amp;) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="255.6094"/>
       <ellipse cx="17" cy="260.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="263.8198">widget(const widget &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="268.4141"/>
       <ellipse cx="17" cy="273.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="26" y="276.6245">~widget() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="283.2188" y2="283.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.2188"/>
       <ellipse cx="17" cy="294.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="26" y="297.4292">operator=(widget &amp;&amp;) : widget &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="302.0234"/>
       <ellipse cx="17" cy="307.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="310.2339">operator=(const widget &amp;) = deleted : widget &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="316.8281" y2="316.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.8281"/>
       <ellipse cx="17" cy="327.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="331.0386">draw() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.6328"/>
       <ellipse cx="17" cy="340.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="26" y="343.8433">draw() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348.4375"/>
       <ellipse cx="17" cy="353.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="26" y="356.6479">shown() const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="363.2422" y2="363.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="369.2422"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="371.2422"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="377.4526">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <path d="M150.85,115.27 C150.08,125.14 149.41,135.38 149,145 C148.43,158.51 148.42,172.74 148.76,186.76 " fill="none" id="C_0000130502639682787993-&gt;C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg
index 4bddd61e..c1ad2ba0 100644
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 298.703125 506" style="max-width: 298.703px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 300 506" style="max-width: 300px; background-color: white;" width="300" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,20 +50,22 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M134.97867150821597,153L133.85527313184664,158.66666666666666C132.73187475547732,164.33333333333334,130.48507800273865,175.66666666666666,130.0552560152582,187C129.6254340277778,198.33333333333334,131.01258680555557,209.66666666666666,131.70616319444446,215.33333333333334L132.39973958333334,221"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M166.30338541666666,221L166.99696180555554,215.33333333333334C167.69053819444443,209.66666666666666,169.0776909722222,198.33333333333334,168.6478689847418,187C168.21804699726135,175.66666666666666,165.97125024452268,164.33333333333334,164.84785186815336,158.66666666666666L163.72445349178403,153"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M135.62710900821597,153L134.50371063184664,158.66666666666666C133.38031225547732,164.33333333333334,131.13351550273865,175.66666666666666,130.7036935152582,187C130.2738715277778,198.33333333333334,131.66102430555557,209.66666666666666,132.35460069444446,215.33333333333334L133.04817708333334,221"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M166.95182291666666,221L167.64539930555554,215.33333333333334C168.33897569444443,209.66666666666666,169.7261284722222,198.33333333333334,169.2963064847418,187C168.86648449726135,175.66666666666666,166.61968774452268,164.33333333333334,165.49628936815336,158.66666666666666L164.37289099178403,153"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(170.46484375, 187)" class="edgeLabel">
+        <g transform="translate(171.11328125, 187)" class="edgeLabel">
           <g transform="translate(-22.2265625, -9)" class="label">
             <foreignObject height="18" width="44.453125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -76,11 +78,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(149.3515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018_impl.h#L9">
+        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018_impl.h#L9">
           <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
-            <rect height="145" width="232.421875" y="-72.5" x="-116.2109375" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="116.2109375" x1="-116.2109375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="116.2109375" x1="-116.2109375" class="divider"/>
+            <rect height="145" width="284" y="-72.5" x="-142" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="142" x1="-142" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="142" x1="-142" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -92,22 +94,22 @@
                   <span class="nodeLabel">impl::widget</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -108.7109375, -31)" height="18" width="44.46875">
+              <foreignObject transform="translate( -134.5, -31)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-n : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -108.7109375, 3)" height="18" width="139.1875">
+              <foreignObject transform="translate( -134.5, 3)" height="18" width="139.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+widget(int n) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -108.7109375, 25)" height="18" width="217.421875">
+              <foreignObject transform="translate( -134.5, 25)" height="18" width="269">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw(const widget &amp; w) : void</span>
+                  <span class="nodeLabel">+draw(const widget &amp; w) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -108.7109375, 47)" height="18" width="217.421875">
+              <foreignObject transform="translate( -134.5, 47)" height="18" width="217.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+draw(const widget &amp; w) : void</span>
                 </div>
@@ -115,7 +117,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(149.3515625, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00018/t00018.h#L17">
+        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00018/t00018.h#L17">
           <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
             <rect height="277" width="282.703125" y="-138.5" x="-141.3515625" class="outer title-state"/>
             <line y2="-108.5" y1="-108.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
@@ -166,9 +168,9 @@
                   <span class="nodeLabel">+operator=(const widget &amp;) : widget &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 69)" height="18" width="97.375">
+              <foreignObject transform="translate( -133.8515625, 69)" height="18" width="148.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw() : void</span>
+                  <span class="nodeLabel">+draw() : [const] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -133.8515625, 91)" height="18" width="97.375">
@@ -176,9 +178,9 @@
                   <span class="nodeLabel">+draw() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 113)" height="18" width="109.84375">
+              <foreignObject transform="translate( -133.8515625, 113)" height="18" width="161.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+shown() : bool</span>
+                  <span class="nodeLabel">+shown() : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index d77281ad..18a2233d 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -739,7 +739,7 @@ class Base {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index eb2a6169..f385fcf5 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_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="693px" preserveAspectRatio="none" style="width:797px;height:693px;" version="1.1" viewBox="0 0 797 693" width="797px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpx3qtb3jrq71" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f2hkskotwv54b" 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"/>
@@ -9,45 +9,45 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
       <ellipse cx="97.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M100.7188,29.6406 Q100.1406,29.9375 99.5,30.0781 Q98.8594,30.2344 98.1563,30.2344 Q95.6563,30.2344 94.3281,28.5938 Q93.0156,26.9375 93.0156,23.8125 Q93.0156,20.6875 94.3281,19.0313 Q95.6563,17.375 98.1563,17.375 Q98.8594,17.375 99.5,17.5313 Q100.1563,17.6875 100.7188,17.9844 L100.7188,20.7031 Q100.0938,20.125 99.5,19.8594 Q98.9063,19.5781 98.2813,19.5781 Q96.9375,19.5781 96.25,20.6563 Q95.5625,21.7188 95.5625,23.8125 Q95.5625,25.9063 96.25,26.9844 Q96.9375,28.0469 98.2813,28.0469 Q98.9063,28.0469 99.5,27.7813 Q100.0938,27.5 100.7188,26.9219 L100.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="118.25" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="128" x="26" y="54.2104">Base() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="67.0151">~Base() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="228" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="87.8198">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="100.6245">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="107.2188" y2="107.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
       <ellipse cx="506.5" cy="625" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M509.4688,630.6406 Q508.8906,630.9375 508.25,631.0781 Q507.6094,631.2344 506.9063,631.2344 Q504.4063,631.2344 503.0781,629.5938 Q501.7656,627.9375 501.7656,624.8125 Q501.7656,621.6875 503.0781,620.0313 Q504.4063,618.375 506.9063,618.375 Q507.6094,618.375 508.25,618.5313 Q508.9063,618.6875 509.4688,618.9844 L509.4688,621.7031 Q508.8438,621.125 508.25,620.8594 Q507.6563,620.5781 507.0313,620.5781 Q505.6875,620.5781 505,621.6563 Q504.3125,622.7188 504.3125,624.8125 Q504.3125,626.9063 505,627.9844 Q505.6875,629.0469 507.0313,629.0469 Q507.6563,629.0469 508.25,628.7813 Q508.8438,628.5 509.4688,627.9219 L509.4688,630.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="520.5" y="629.1543">Layer1</text>
@@ -55,23 +55,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="570.5" y="618.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="641" y2="641"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="647"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="649"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="511.5" y="655.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="659.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="661.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="511.5" y="668.0151">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="674.6094" y2="674.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
       <ellipse cx="231.15" cy="503" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M234.1188,508.6406 Q233.5406,508.9375 232.9,509.0781 Q232.2594,509.2344 231.5563,509.2344 Q229.0563,509.2344 227.7281,507.5938 Q226.4156,505.9375 226.4156,502.8125 Q226.4156,499.6875 227.7281,498.0313 Q229.0563,496.375 231.5563,496.375 Q232.2594,496.375 232.9,496.5313 Q233.5563,496.6875 234.1188,496.9844 L234.1188,499.7031 Q233.4938,499.125 232.9,498.8594 Q232.3063,498.5781 231.6813,498.5781 Q230.3375,498.5781 229.65,499.6563 Q228.9625,500.7188 228.9625,502.8125 Q228.9625,504.9063 229.65,505.9844 Q230.3375,507.0469 231.6813,507.0469 Q232.3063,507.0469 232.9,506.7813 Q233.4938,506.5 234.1188,505.9219 L234.1188,508.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="247.85" y="507.1543">Layer2</text>
@@ -79,16 +79,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="310" y="496.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="519" y2="519"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="210" y="525"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="212" y="527"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="533.2104">all_calls_count() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="539.8047" y2="539.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
       <ellipse cx="37.5" cy="301" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M40.4688,306.6406 Q39.8906,306.9375 39.25,307.0781 Q38.6094,307.2344 37.9063,307.2344 Q35.4063,307.2344 34.0781,305.5938 Q32.7656,303.9375 32.7656,300.8125 Q32.7656,297.6875 34.0781,296.0313 Q35.4063,294.375 37.9063,294.375 Q38.6094,294.375 39.25,294.5313 Q39.9063,294.6875 40.4688,294.9844 L40.4688,297.7031 Q39.8438,297.125 39.25,296.8594 Q38.6563,296.5781 38.0313,296.5781 Q36.6875,296.5781 36,297.6563 Q35.3125,298.7188 35.3125,300.8125 Q35.3125,302.9063 36,303.9844 Q36.6875,305.0469 38.0313,305.0469 Q38.6563,305.0469 39.25,304.7813 Q39.8438,304.5 40.4688,303.9219 L40.4688,306.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="51.5" y="305.1543">Layer3</text>
@@ -96,51 +96,51 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="101.5" y="294.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="317" y2="317"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="323"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="325"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="42.5" y="331.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="335.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="337.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="344.0151">m1_calls() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="348.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="350.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="42.5" y="356.8198">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="361.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="363.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="369.6245">m2_calls() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="376.2188" y2="376.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="382.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="384.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="390.4292">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="395.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="397.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="403.2339">m_m2_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
       <ellipse cx="79" cy="192" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.9688,197.6406 Q81.3906,197.9375 80.75,198.0781 Q80.1094,198.2344 79.4063,198.2344 Q76.9063,198.2344 75.5781,196.5938 Q74.2656,194.9375 74.2656,191.8125 Q74.2656,188.6875 75.5781,187.0313 Q76.9063,185.375 79.4063,185.375 Q80.1094,185.375 80.75,185.5313 Q81.4063,185.6875 81.9688,185.9844 L81.9688,188.7031 Q81.3438,188.125 80.75,187.8594 Q80.1563,187.5781 79.5313,187.5781 Q78.1875,187.5781 77.5,188.6563 Q76.8125,189.7188 76.8125,191.8125 Q76.8125,193.9063 77.5,194.9844 Q78.1875,196.0469 79.5313,196.0469 Q80.1563,196.0469 80.75,195.7813 Q81.3438,195.5 81.9688,194.9219 L81.9688,197.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="93" y="196.1543">Layer3</text>
@@ -149,8 +149,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="208" y2="208"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
       <ellipse cx="222.5" cy="339.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M225.4688,345.1406 Q224.8906,345.4375 224.25,345.5781 Q223.6094,345.7344 222.9063,345.7344 Q220.4063,345.7344 219.0781,344.0938 Q217.7656,342.4375 217.7656,339.3125 Q217.7656,336.1875 219.0781,334.5313 Q220.4063,332.875 222.9063,332.875 Q223.6094,332.875 224.25,333.0313 Q224.9063,333.1875 225.4688,333.4844 L225.4688,336.2031 Q224.8438,335.625 224.25,335.3594 Q223.6563,335.0781 223.0313,335.0781 Q221.6875,335.0781 221,336.1563 Q220.3125,337.2188 220.3125,339.3125 Q220.3125,341.4063 221,342.4844 Q221.6875,343.5469 223.0313,343.5469 Q223.6563,343.5469 224.25,343.2813 Q224.8438,343 225.4688,342.4219 L225.4688,345.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="236.5" y="343.6543">Layer2</text>
@@ -159,8 +159,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="355.5" y2="355.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="363.5" y2="363.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
       <ellipse cx="465" cy="509.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.9688,515.1406 Q467.3906,515.4375 466.75,515.5781 Q466.1094,515.7344 465.4063,515.7344 Q462.9063,515.7344 461.5781,514.0938 Q460.2656,512.4375 460.2656,509.3125 Q460.2656,506.1875 461.5781,504.5313 Q462.9063,502.875 465.4063,502.875 Q466.1094,502.875 466.75,503.0313 Q467.4063,503.1875 467.9688,503.4844 L467.9688,506.2031 Q467.3438,505.625 466.75,505.3594 Q466.1563,505.0781 465.5313,505.0781 Q464.1875,505.0781 463.5,506.1563 Q462.8125,507.2188 462.8125,509.3125 Q462.8125,511.4063 463.5,512.4844 Q464.1875,513.5469 465.5313,513.5469 Q466.1563,513.5469 466.75,513.2813 Q467.3438,513 467.9688,512.4219 L467.9688,515.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="479" y="513.6543">Layer1</text>
@@ -169,19 +169,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="525.5" y2="525.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="533.5" y2="533.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpx3qtb3jrq71)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2hkskotwv54b)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
       <ellipse cx="591.25" cy="333" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M594.2188,338.6406 Q593.6406,338.9375 593,339.0781 Q592.3594,339.2344 591.6563,339.2344 Q589.1563,339.2344 587.8281,337.5938 Q586.5156,335.9375 586.5156,332.8125 Q586.5156,329.6875 587.8281,328.0313 Q589.1563,326.375 591.6563,326.375 Q592.3594,326.375 593,326.5313 Q593.6563,326.6875 594.2188,326.9844 L594.2188,329.7031 Q593.5938,329.125 593,328.8594 Q592.4063,328.5781 591.7813,328.5781 Q590.4375,328.5781 589.75,329.6563 Q589.0625,330.7188 589.0625,332.8125 Q589.0625,334.9063 589.75,335.9844 Q590.4375,337.0469 591.7813,337.0469 Q592.4063,337.0469 593,336.7813 Q593.5938,336.5 594.2188,335.9219 L594.2188,338.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="611.75" y="337.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="349" y2="349"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="357" y2="357"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="418.5" y="363"/>
       <ellipse cx="423.5" cy="368" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="432.5" y="371.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M114.33,224.05 C112.76,235.48 110.76,250.03 108.69,265.08 " fill="none" id="C_0000972890420743280319-&gt;C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg
index eb369a12..32dfe464 100644
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 929.109375 805" style="max-width: 929.109px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 929.953125 805" style="max-width: 929.953px; background-color: white;" width="929.953125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,20 +50,22 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M151.0078125,259.68867044318563L141.76432291666666,263.90722536932134C132.52083333333334,268.1257802954571,114.03385416666667,276.5628901477285,104.79036458333333,284.9481117405309C95.546875,293.3333333333333,95.546875,301.6666666666667,95.546875,305.8333333333333L95.546875,310"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M212.7734375,153L212.7734375,157.16666666666666C212.7734375,161.33333333333334,212.7734375,169.66666666666666,212.7734375,178C212.7734375,186.33333333333334,212.7734375,194.66666666666666,212.7734375,198.83333333333334L212.7734375,203"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M327.78210116731515,433L326.485084306096,449.6666666666667C325.18806744487676,466.3333333333333,322.5940337224384,499.6666666666667,321.2970168612192,522C320,544.3333333333334,320,555.6666666666666,320,561.3333333333334L320,567"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M274.5390625,259.68867044318563L283.7825520833333,263.90722536932134C293.0260416666667,268.1257802954571,311.5130208333333,276.5628901477285,320.7565104166667,295.9481117405309C330,315.3333333333333,330,345.6666666666667,330,360.8333333333333L330,376"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M676,635L676,641C676,647,676,659,676,669.1666666666666C676,679.3333333333334,676,687.6666666666666,676,691.8333333333334L676,696"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M365.8181997811284,433L386.764515442607,449.6666666666667C407.7108311040856,466.3333333333333,449.6034624270428,499.6666666666667,489.3767072977051,523.8333333333334C529.1499521683673,548,566.8038105867347,563,585.6307397959184,570.5L604.457669005102,578"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M699.0078125,444L699.0078125,458.8333333333333C699.0078125,473.6666666666667,699.0078125,503.3333333333333,696.6600765306122,525.6666666666666C694.3123405612245,548,689.616868622449,563,687.2691326530612,570.5L684.9213966836735,578"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M151.640625,259.63803885045235L142.36197916666666,263.865032375377C133.08333333333334,268.09202590030156,114.52604166666667,276.5460129501508,105.24739583333333,284.93967314174205C95.96875,293.3333333333333,95.96875,301.6666666666667,95.96875,305.8333333333333L95.96875,310"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M213.40625,153L213.40625,157.16666666666666C213.40625,161.33333333333334,213.40625,169.66666666666666,213.40625,178C213.40625,186.33333333333334,213.40625,194.66666666666666,213.40625,198.83333333333334L213.40625,203"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M328.62585116731515,433L327.328834306096,449.6666666666667C326.03181744487676,466.3333333333333,323.4377837224384,499.6666666666667,322.1407668612192,522C320.84375,544.3333333333334,320.84375,555.6666666666666,320.84375,561.3333333333334L320.84375,567"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M275.171875,259.63803885045235L284.4505208333333,263.865032375377C293.7291666666667,268.09202590030156,312.2864583333333,276.5460129501508,321.5651041666667,295.93967314174205C330.84375,315.3333333333333,330.84375,345.6666666666667,330.84375,360.8333333333333L330.84375,376"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M676.84375,635L676.84375,641C676.84375,647,676.84375,659,676.84375,669.1666666666666C676.84375,679.3333333333334,676.84375,687.6666666666666,676.84375,691.8333333333334L676.84375,696"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M366.6619497811284,433L387.608265442607,449.6666666666667C408.5545811040856,466.3333333333333,450.4472124270428,499.6666666666667,490.2204572977051,523.8333333333334C529.9937021683673,548,567.6475605867347,563,586.4744897959184,570.5L605.301419005102,578"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M699.8515625,444L699.8515625,458.8333333333333C699.8515625,473.6666666666667,699.8515625,503.3333333333333,697.5038265306122,525.6666666666666C695.1560905612245,548,690.460618622449,563,688.1128826530612,570.5L685.7651466836735,578"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -77,11 +79,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -95,11 +99,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -113,7 +119,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(699.0078125, 533)" class="edgeLabel">
+        <g transform="translate(699.8515625, 533)" class="edgeLabel">
           <g transform="translate(-26.015625, -9)" class="label">
             <foreignObject height="18" width="52.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -126,11 +132,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.7734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_base.h#L8">
+        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_base.h#L8">
           <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
-            <rect height="145" width="135.90625" y="-72.5" x="-67.953125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="67.953125" x1="-67.953125" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="67.953125" x1="-67.953125" class="divider"/>
+            <rect height="145" width="254.671875" y="-72.5" x="-127.3359375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -142,22 +148,22 @@
                   <span class="nodeLabel">Base</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.453125, -19)" height="18" width="95.140625">
+              <foreignObject transform="translate( -119.8359375, -19)" height="18" width="156.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-Base() : void</span>
+                  <span class="nodeLabel">-Base() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.453125, 3)" height="18" width="104.484375">
+              <foreignObject transform="translate( -119.8359375, 3)" height="18" width="239.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-~Base() : void</span>
+                  <span class="nodeLabel">-~Base() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.453125, 25)" height="18" width="68.453125">
+              <foreignObject transform="translate( -119.8359375, 25)" height="18" width="68.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m1() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.453125, 47)" height="18" width="120.90625">
+              <foreignObject transform="translate( -119.8359375, 47)" height="18" width="120.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m2() : std::string</span>
                 </div>
@@ -165,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
             <rect height="101" width="175.09375" y="-50.5" x="-87.546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -194,11 +200,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(320, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
-            <rect height="79" width="175.09375" y="-39.5" x="-87.546875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="87.546875" x1="-87.546875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="87.546875" x1="-87.546875" class="divider"/>
+            <rect height="79" width="217.75" y="-39.5" x="-108.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="108.875" x1="-108.875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="108.875" x1="-108.875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -210,19 +216,19 @@
                   <span class="nodeLabel">Layer2&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 14)" height="18" width="151.171875">
+              <foreignObject transform="translate( -101.375, 14)" height="18" width="202.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-all_calls_count() : int</span>
+                  <span class="nodeLabel">-all_calls_count() : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(95.546875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer3.h#L8">
+        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer3.h#L8">
           <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
-            <rect height="189" width="175.09375" y="-94.5" x="-87.546875" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="87.546875" x1="-87.546875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="87.546875" x1="-87.546875" class="divider"/>
+            <rect height="189" width="175.9375" y="-94.5" x="-87.96875" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="87.96875" x1="-87.96875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="87.96875" x1="-87.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -234,40 +240,40 @@
                   <span class="nodeLabel">Layer3&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, -53)" height="18" width="120.921875">
+              <foreignObject transform="translate( -80.46875, -53)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m1_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, -31)" height="18" width="120.921875">
+              <foreignObject transform="translate( -80.46875, -31)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m2_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 3)" height="18" width="68.453125">
+              <foreignObject transform="translate( -80.46875, 3)" height="18" width="68.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m1() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 25)" height="18" width="109.359375">
+              <foreignObject transform="translate( -80.46875, 25)" height="18" width="160.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1_calls() : int</span>
+                  <span class="nodeLabel">-m1_calls() : [const] int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 47)" height="18" width="120.90625">
+              <foreignObject transform="translate( -80.46875, 47)" height="18" width="120.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m2() : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 69)" height="18" width="109.359375">
+              <foreignObject transform="translate( -80.46875, 69)" height="18" width="160.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2_calls() : int</span>
+                  <span class="nodeLabel">-m2_calls() : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(212.7734375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
             <rect height="57" width="123.53125" y="-28.5" x="-61.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -286,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(330, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
             <rect height="57" width="193.8125" y="-28.5" x="-96.90625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -305,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
+        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
           <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
             <rect height="57" width="264.09375" y="-28.5" x="-132.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -324,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.0078125, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00019/t00019.cc#L11">
+        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00019/t00019.cc#L11">
           <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
             <rect height="79" width="444.203125" y="-39.5" x="-222.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md
index 0a0a9c16..a962d6b6 100644
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -736,7 +736,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 813e86be..a2ca8e3c 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_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="886px" preserveAspectRatio="none" style="width:763px;height:886px;" version="1.1" viewBox="0 0 763 886" width="763px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vc1enlla0bee" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19zog48lix4kq" 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"/>
@@ -9,175 +9,175 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
       <ellipse cx="370.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M370.3594,153.3438 L369.2031,158.4219 L371.5313,158.4219 L370.3594,153.3438 Z M368.875,151.1094 L371.8594,151.1094 L375.2188,163.5 L372.7656,163.5 L372,160.4375 L368.7188,160.4375 L367.9688,163.5 L365.5313,163.5 L368.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="390.75" y="162.1543">ProductA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="180"/>
       <ellipse cx="291.5" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="300.5" y="188.2104">~ProductA() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="281.5" x2="523.5" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="200.8047"/>
       <ellipse cx="291.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="300.5" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="215.6094" y2="215.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
       <ellipse cx="226.75" cy="300" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.7188,305.6406 Q229.1406,305.9375 228.5,306.0781 Q227.8594,306.2344 227.1563,306.2344 Q224.6563,306.2344 223.3281,304.5938 Q222.0156,302.9375 222.0156,299.8125 Q222.0156,296.6875 223.3281,295.0313 Q224.6563,293.375 227.1563,293.375 Q227.8594,293.375 228.5,293.5313 Q229.1563,293.6875 229.7188,293.9844 L229.7188,296.7031 Q229.0938,296.125 228.5,295.8594 Q227.9063,295.5781 227.2813,295.5781 Q225.9375,295.5781 225.25,296.6563 Q224.5625,297.7188 224.5625,299.8125 Q224.5625,301.9063 225.25,302.9844 Q225.9375,304.0469 227.2813,304.0469 Q227.9063,304.0469 228.5,303.7813 Q229.0938,303.5 229.7188,302.9219 L229.7188,305.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="247.25" y="304.1543">ProductA1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="316" y2="316"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="184" y="322"/>
       <ellipse cx="189" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="198" y="330.2104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="336.8047" y2="336.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
       <ellipse cx="575.75" cy="427.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M578.7188,433.1406 Q578.1406,433.4375 577.5,433.5781 Q576.8594,433.7344 576.1563,433.7344 Q573.6563,433.7344 572.3281,432.0938 Q571.0156,430.4375 571.0156,427.3125 Q571.0156,424.1875 572.3281,422.5313 Q573.6563,420.875 576.1563,420.875 Q576.8594,420.875 577.5,421.0313 Q578.1563,421.1875 578.7188,421.4844 L578.7188,424.2031 Q578.0938,423.625 577.5,423.3594 Q576.9063,423.0781 576.2813,423.0781 Q574.9375,423.0781 574.25,424.1563 Q573.5625,425.2188 573.5625,427.3125 Q573.5625,429.4063 574.25,430.4844 Q574.9375,431.5469 576.2813,431.5469 Q576.9063,431.5469 577.5,431.2813 Q578.0938,431 578.7188,430.4219 L578.7188,433.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="596.25" y="431.6543">ProductA2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="443.5" y2="443.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="533" y="449.5"/>
       <ellipse cx="538" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="547" y="457.7104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="464.3047" y2="464.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
       <ellipse cx="96.25" cy="555" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M96.3594,550.3438 L95.2031,555.4219 L97.5313,555.4219 L96.3594,550.3438 Z M94.875,548.1094 L97.8594,548.1094 L101.2188,560.5 L98.7656,560.5 L98,557.4375 L94.7188,557.4375 L93.9688,560.5 L91.5313,560.5 L94.875,548.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="116.75" y="559.1543">ProductB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="571" y2="571"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="577"/>
       <ellipse cx="17" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="26" y="585.2104">~ProductB() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="250" y1="591.8047" y2="591.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="597.8047"/>
       <ellipse cx="17" cy="602.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="606.0151">buy(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="612.6094" y2="612.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
       <ellipse cx="297.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M300.7188,702.6406 Q300.1406,702.9375 299.5,703.0781 Q298.8594,703.2344 298.1563,703.2344 Q295.6563,703.2344 294.3281,701.5938 Q293.0156,699.9375 293.0156,696.8125 Q293.0156,693.6875 294.3281,692.0313 Q295.6563,690.375 298.1563,690.375 Q298.8594,690.375 299.5,690.5313 Q300.1563,690.6875 300.7188,690.9844 L300.7188,693.7031 Q300.0938,693.125 299.5,692.8594 Q298.9063,692.5781 298.2813,692.5781 Q296.9375,692.5781 296.25,693.6563 Q295.5625,694.7188 295.5625,696.8125 Q295.5625,698.9063 296.25,699.9844 Q296.9375,701.0469 298.2813,701.0469 Q298.9063,701.0469 299.5,700.7813 Q300.0938,700.5 300.7188,699.9219 L300.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="318.25" y="701.1543">ProductB1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="255" y="719"/>
       <ellipse cx="260" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="269" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
       <ellipse cx="91.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M94.7188,702.6406 Q94.1406,702.9375 93.5,703.0781 Q92.8594,703.2344 92.1563,703.2344 Q89.6563,703.2344 88.3281,701.5938 Q87.0156,699.9375 87.0156,696.8125 Q87.0156,693.6875 88.3281,692.0313 Q89.6563,690.375 92.1563,690.375 Q92.8594,690.375 93.5,690.5313 Q94.1563,690.6875 94.7188,690.9844 L94.7188,693.7031 Q94.0938,693.125 93.5,692.8594 Q92.9063,692.5781 92.2813,692.5781 Q90.9375,692.5781 90.25,693.6563 Q89.5625,694.7188 89.5625,696.8125 Q89.5625,698.9063 90.25,699.9844 Q90.9375,701.0469 92.2813,701.0469 Q92.9063,701.0469 93.5,700.7813 Q94.0938,700.5 94.7188,699.9219 L94.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="112.25" y="701.1543">ProductB2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="719"/>
       <ellipse cx="54" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="63" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
       <ellipse cx="209.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M209.8594,19.3438 L208.7031,24.4219 L211.0313,24.4219 L209.8594,19.3438 Z M208.375,17.1094 L211.3594,17.1094 L214.7188,29.5 L212.2656,29.5 L211.5,26.4375 L208.2188,26.4375 L207.4688,29.5 L205.0313,29.5 L208.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="230.25" y="28.1543">AbstractFactory</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="46"/>
       <ellipse cx="123.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="54.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="58.8047"/>
       <ellipse cx="123.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="67.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
       <ellipse cx="232.25" cy="421" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.2188,426.6406 Q234.6406,426.9375 234,427.0781 Q233.3594,427.2344 232.6563,427.2344 Q230.1563,427.2344 228.8281,425.5938 Q227.5156,423.9375 227.5156,420.8125 Q227.5156,417.6875 228.8281,416.0313 Q230.1563,414.375 232.6563,414.375 Q233.3594,414.375 234,414.5313 Q234.6563,414.6875 235.2188,414.9844 L235.2188,417.7031 Q234.5938,417.125 234,416.8594 Q233.4063,416.5781 232.7813,416.5781 Q231.4375,416.5781 230.75,417.6563 Q230.0625,418.7188 230.0625,420.8125 Q230.0625,422.9063 230.75,423.9844 Q231.4375,425.0469 232.7813,425.0469 Q233.4063,425.0469 234,424.7813 Q234.5938,424.5 235.2188,423.9219 L235.2188,426.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="252.75" y="425.1543">Factory1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="437" y2="437"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="443"/>
       <ellipse cx="134.5" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="143.5" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="455.8047"/>
       <ellipse cx="134.5" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="143.5" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="470.6094" y2="470.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vc1enlla0bee)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19zog48lix4kq)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
       <ellipse cx="442.25" cy="818" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M445.2188,823.6406 Q444.6406,823.9375 444,824.0781 Q443.3594,824.2344 442.6563,824.2344 Q440.1563,824.2344 438.8281,822.5938 Q437.5156,820.9375 437.5156,817.8125 Q437.5156,814.6875 438.8281,813.0313 Q440.1563,811.375 442.6563,811.375 Q443.3594,811.375 444,811.5313 Q444.6563,811.6875 445.2188,811.9844 L445.2188,814.7031 Q444.5938,814.125 444,813.8594 Q443.4063,813.5781 442.7813,813.5781 Q441.4375,813.5781 440.75,814.6563 Q440.0625,815.7188 440.0625,817.8125 Q440.0625,819.9063 440.75,820.9844 Q441.4375,822.0469 442.7813,822.0469 Q443.4063,822.0469 444,821.7813 Q444.5938,821.5 445.2188,820.9219 L445.2188,823.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="462.75" y="822.1543">Factory2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="834" y2="834"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="840"/>
       <ellipse cx="344.5" cy="845" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="353.5" y="848.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="852.8047"/>
       <ellipse cx="344.5" cy="857.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="353.5" y="861.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="867.6094" y2="867.6094"/>
diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg
index b86b1e86..cfa8e199 100644
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 867.86328125 592" style="max-width: 867.863px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1061.28125 592" style="max-width: 1061.28px; background-color: white;" width="1061.28125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,18 +50,18 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M193.71484375,430.44121111414927L175.98111979166666,438.70100926179106C158.24739583333334,446.96080740943285,122.77994791666667,463.48040370471637,105.04622395833333,475.90686851902484C87.3125,488.3333333333333,87.3125,496.6666666666667,87.3125,500.8333333333333L87.3125,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M289.3160675578035,455L290.4196396315029,459.1666666666667C291.5232117052023,463.3333333333333,293.7303558526012,471.6666666666667,294.8339279263006,480C295.9375,488.3333333333333,295.9375,496.6666666666667,295.9375,500.8333333333333L295.9375,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M611.85546875,430.6777438194721L594.1217447916666,438.8981198495601C576.3880208333334,447.11849587964804,540.9205729166666,463.55924793982405,523.1868489583334,475.9462906365787C505.453125,488.3333333333333,505.453125,496.6666666666667,505.453125,500.8333333333333L505.453125,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M708.9805364884393,455L710.1270095736994,459.1666666666667C711.2734826589594,463.3333333333333,713.5664288294797,471.6666666666667,714.71290191474,480C715.859375,488.3333333333333,715.859375,496.6666666666667,715.859375,500.8333333333333L715.859375,505"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M242.890625,112.04997984945594L217.44596354166666,119.37498320787995C192.00130208333334,126.69998656630396,141.11197916666666,141.34999328315197,115.66731770833333,161.25832997490932C90.22265625,181.16666666666666,90.22265625,206.33333333333334,90.22265625,231.5C90.22265625,256.6666666666667,90.22265625,281.8333333333333,107.47135416666667,302.578450646039C124.72005208333333,323.32356795874466,159.21744791666666,339.6471359174894,176.46614583333334,347.8089198968617L193.71484375,355.97070387623404"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M455.68079389450867,131L460.08360428709057,135.16666666666666C464.48641467967246,139.33333333333334,473.29203546483626,147.66666666666666,477.6948458574181,164.41666666666666C482.09765625,181.16666666666666,482.09765625,206.33333333333334,482.09765625,231.5C482.09765625,256.6666666666667,482.09765625,281.8333333333333,503.7239583333333,303.32630077519383C525.3502604166666,324.8192682170543,568.6028645833334,342.6385364341086,590.2291666666666,351.54817054263566L611.85546875,360.4578046511628"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M275.9375,282L275.9375,286.1666666666667C275.9375,290.3333333333333,275.9375,298.6666666666667,275.7973190631021,307C275.65713812620425,315.3333333333333,275.3767762524085,323.6666666666667,275.2365953155106,327.8333333333333L275.09641437861274,332"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M423.7421875,259.23723712060894L466.1614583333333,267.1976976005074C508.5807291666667,275.15815808040594,593.4192708333334,291.079079040203,636.5033191835261,303.20620618676816C679.5873675337187,315.3333333333333,680.9169225674374,323.6666666666667,681.5817000842967,327.8333333333333L682.246477601156,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M309.10449783236993,131L303.57666486030826,135.16666666666666C298.04883188824664,139.33333333333334,286.9931659441233,147.66666666666666,281.4653329720616,156C275.9375,164.33333333333334,275.9375,172.66666666666666,275.9375,176.83333333333334L275.9375,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M564.25390625,266.22473228068895L535.3274739583334,273.02061023390746C506.4010416666667,279.81648818712597,448.5481770833333,293.408244093563,413.2291666666667,304.9034298846462C377.91015625,316.3986156757295,365.125,325.797231351459,358.732421875,330.49653918932376L352.33984375,335.1958470271885"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M712.05859375,282L712.05859375,286.1666666666667C712.05859375,290.3333333333333,712.05859375,298.6666666666667,711.0952026131985,307C710.1318114763968,315.3333333333333,708.2050292027939,323.6666666666667,707.2416380659923,327.8333333333333L706.2782469291908,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M538.5,109.28396479840524L567.4264322916666,117.06997066533769C596.3528645833334,124.85597653227016,654.2057291666666,140.4279882661351,683.1321614583334,152.38066079973422C712.05859375,164.33333333333334,712.05859375,172.66666666666666,712.05859375,176.83333333333334L712.05859375,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M193.484375,449.0144309438429L180.08723958333334,454.1786924532025C166.69010416666666,459.3429539625619,139.89583333333334,469.67147698128093,126.49869791666667,479.0024051573071C113.1015625,488.3333333333333,113.1015625,496.6666666666667,113.1015625,500.8333333333333L113.1015625,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M362.95651192196533,455L364.68120785163774,459.1666666666667C366.4059037813102,463.3333333333333,369.85529564065513,471.6666666666667,371.57999157032754,480C373.3046875,488.3333333333333,373.3046875,496.6666666666667,373.3046875,500.8333333333333L373.3046875,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M715.671875,448.794968269931L702.1263020833334,453.99580689160916C688.5807291666666,459.19664551328736,661.4895833333334,469.59832275664365,647.9440104166666,478.9658280449885C634.3984375,488.3333333333333,634.3984375,496.6666666666667,634.3984375,500.8333333333333L634.3984375,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M885.7772308526012,455L887.5448277938343,459.1666666666667C889.3124247350675,463.3333333333333,892.8476186175336,471.6666666666667,894.6152155587669,480C896.3828125,488.3333333333333,896.3828125,496.6666666666667,896.3828125,500.8333333333333L896.3828125,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M320.2578125,110.64550553379145L288.3658854166667,118.2045879448262C256.4739583333333,125.76367035586095,192.69010416666666,140.88183517793047,160.79817708333334,161.0242509222986C128.90625,181.16666666666666,128.90625,206.33333333333334,128.90625,231.5C128.90625,256.6666666666667,128.90625,281.8333333333333,139.66927083333334,298.8798938826467C150.43229166666666,315.92645443196005,171.95833333333334,324.8529088639201,182.72135416666666,329.3161360799001L193.484375,333.77936329588016"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M568.0048320086705,131L573.0287662572255,135.16666666666666C578.0527005057803,139.33333333333334,588.1005690028902,147.66666666666666,593.1245032514452,164.41666666666666C598.1484375,181.16666666666666,598.1484375,206.33333333333334,598.1484375,231.5C598.1484375,256.6666666666667,598.1484375,281.8333333333333,617.7356770833334,300.89484322569723C637.3229166666666,319.95635311806114,676.4973958333334,332.91270623612235,696.0846354166666,339.3908827951529L715.671875,345.8690593541835"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M353.3046875,282L353.3046875,286.1666666666667C353.3046875,290.3333333333333,353.3046875,298.6666666666667,352.54338270712907,307C351.7820779142582,315.3333333333333,350.25946832851633,323.6666666666667,349.4981635356455,327.8333333333333L348.7368587427746,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M526.8984375,258.82263843648207L577.9140625,266.8521986970684C628.9296875,274.8817589576547,730.9609375,290.94087947882736,783.2624638728324,303.13710640608036C835.5639902456647,315.3333333333333,838.1357929913296,323.6666666666667,839.4216943641619,327.8333333333333L840.7075957369942,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.9251716040462,131L387.1550909200385,135.16666666666666C380.38501023603084,139.33333333333334,366.8448488680154,147.66666666666666,360.0747681840077,156C353.3046875,164.33333333333334,353.3046875,172.66666666666666,353.3046875,176.83333333333334L353.3046875,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M706.09375,265.4686557191164L670.7200520833334,272.390546432597C635.3463541666666,279.31243714607757,564.5989583333334,293.1562185730388,521.6938749397881,304.2447759531861C478.78879154624275,315.3333333333333,463.72602059248555,323.6666666666667,456.1946351156069,327.8333333333333L448.6632496387283,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M879.6875,282L879.6875,286.1666666666667C879.6875,290.3333333333333,879.6875,298.6666666666667,878.7241088631985,307C877.7607177263968,315.3333333333333,875.8339354527939,323.6666666666667,874.8705443159923,327.8333333333333L873.9071531791908,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M667.4453125,108.41773138680219L702.8190104166666,116.34810948900183C738.1927083333334,124.27848759120145,808.9401041666666,140.13924379560072,844.3138020833334,152.23628856446703C879.6875,164.33333333333334,879.6875,172.66666666666666,879.6875,176.83333333333334L879.6875,181"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -100,11 +100,46 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -118,47 +153,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -174,11 +186,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(273.02734375, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L6">
+        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L6">
           <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
-            <rect height="123" width="158.625" y="-61.5" x="-79.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="79.3125" x1="-79.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="79.3125" x1="-79.3125" class="divider"/>
+            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -190,24 +202,24 @@
                   <span class="nodeLabel">ProductA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 14)" height="18" width="137.84375">
+              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductA() : void</span>
+                  <span class="nodeLabel">+~ProductA() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 36)" height="18" width="143.625">
+              <foreignObject transform="translate( -136.515625, 36)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(87.3125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L12">
+        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L12">
           <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
-            <rect height="79" width="158.625" y="-39.5" x="-79.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="79.3125" x1="-79.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="79.3125" x1="-79.3125" class="divider"/>
+            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -219,19 +231,19 @@
                   <span class="nodeLabel">ProductA1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 14)" height="18" width="143.625">
+              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : bool</span>
+                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(295.9375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L17">
+        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L17">
           <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
-            <rect height="79" width="158.625" y="-39.5" x="-79.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="79.3125" x1="-79.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="79.3125" x1="-79.3125" class="divider"/>
+            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -243,19 +255,19 @@
                   <span class="nodeLabel">ProductA2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 14)" height="18" width="143.625">
+              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : bool</span>
+                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(692.05859375, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L22">
+        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L22">
           <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
-            <rect height="123" width="160.40625" y="-61.5" x="-80.203125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="80.203125" x1="-80.203125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -267,24 +279,24 @@
                   <span class="nodeLabel">ProductB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 14)" height="18" width="137.84375">
+              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductB() : void</span>
+                  <span class="nodeLabel">+~ProductB() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 36)" height="18" width="145.40625">
+              <foreignObject transform="translate( -136.515625, 36)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(505.453125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L28">
+        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L28">
           <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
-            <rect height="79" width="160.40625" y="-39.5" x="-80.203125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="80.203125" x1="-80.203125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -296,19 +308,19 @@
                   <span class="nodeLabel">ProductB1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 14)" height="18" width="145.40625">
+              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : bool</span>
+                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(715.859375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L33">
+        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L33">
           <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
-            <rect height="79" width="160.40625" y="-39.5" x="-80.203125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="80.203125" x1="-80.203125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -320,19 +332,19 @@
                   <span class="nodeLabel">ProductB2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 14)" height="18" width="145.40625">
+              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : bool</span>
+                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(390.6953125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L38">
+        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L38">
           <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
-            <rect height="123" width="295.609375" y="-61.5" x="-147.8046875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
+            <rect height="123" width="347.1875" y="-61.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -344,24 +356,24 @@
                   <span class="nodeLabel">AbstractFactory</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 14)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 14)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_a() : std::unique_ptr&lt;ProductA&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 36)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 36)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_b() : std::unique_ptr&lt;ProductB&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(275.9375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L44">
+        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L44">
           <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
-            <rect height="101" width="295.609375" y="-50.5" x="-147.8046875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
+            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -373,24 +385,24 @@
                   <span class="nodeLabel">Factory1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 3)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 25)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(712.05859375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00020/t00020.cc#L57">
+        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00020/t00020.cc#L57">
           <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
-            <rect height="101" width="295.609375" y="-50.5" x="-147.8046875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="147.8046875" x1="-147.8046875" class="divider"/>
+            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -402,14 +414,14 @@
                   <span class="nodeLabel">Factory2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 3)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.3046875, 25)" height="18" width="280.609375">
+              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md
index 8a2f2fb8..397d2607 100644
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -657,7 +657,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 94d0915e..39ec0cd5 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_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="509px" preserveAspectRatio="none" style="width:990px;height:509px;" version="1.1" viewBox="0 0 990 509" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhl7a99yv0jpw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ct9xmpaz993o" 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"/>
@@ -9,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
       <ellipse cx="469.25" cy="166" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,161.3438 L468.2031,166.4219 L470.5313,166.4219 L469.3594,161.3438 Z M467.875,159.1094 L470.8594,159.1094 L474.2188,171.5 L471.7656,171.5 L471,168.4375 L467.7188,168.4375 L466.9688,171.5 L464.5313,171.5 L467.875,159.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="170.1543">Visitor</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="188"/>
       <ellipse cx="379" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="388" y="196.2104">~Visitor() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="369" x2="616" y1="202.8047" y2="202.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="208.8047"/>
       <ellipse cx="379" cy="213.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="217.0151">visit_A(const A &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="221.6094"/>
       <ellipse cx="379" cy="226.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="229.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="236.4141" y2="236.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
       <ellipse cx="202.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,325.6406 Q205.1406,325.9375 204.5,326.0781 Q203.8594,326.2344 203.1563,326.2344 Q200.6563,326.2344 199.3281,324.5938 Q198.0156,322.9375 198.0156,319.8125 Q198.0156,316.6875 199.3281,315.0313 Q200.6563,313.375 203.1563,313.375 Q203.8594,313.375 204.5,313.5313 Q205.1563,313.6875 205.7188,313.9844 L205.7188,316.7031 Q205.0938,316.125 204.5,315.8594 Q203.9063,315.5781 203.2813,315.5781 Q201.9375,315.5781 201.25,316.6563 Q200.5625,317.7188 200.5625,319.8125 Q200.5625,321.9063 201.25,322.9844 Q201.9375,324.0469 203.2813,324.0469 Q203.9063,324.0469 204.5,323.7813 Q205.0938,323.5 205.7188,322.9219 L205.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="324.1543">Visitor1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="342"/>
       <ellipse cx="128" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="137" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="354.8047"/>
       <ellipse cx="128" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
       <ellipse cx="464.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,325.6406 Q467.1406,325.9375 466.5,326.0781 Q465.8594,326.2344 465.1563,326.2344 Q462.6563,326.2344 461.3281,324.5938 Q460.0156,322.9375 460.0156,319.8125 Q460.0156,316.6875 461.3281,315.0313 Q462.6563,313.375 465.1563,313.375 Q465.8594,313.375 466.5,313.5313 Q467.1563,313.6875 467.7188,313.9844 L467.7188,316.7031 Q467.0938,316.125 466.5,315.8594 Q465.9063,315.5781 465.2813,315.5781 Q463.9375,315.5781 463.25,316.6563 Q462.5625,317.7188 462.5625,319.8125 Q462.5625,321.9063 463.25,322.9844 Q463.9375,324.0469 465.2813,324.0469 Q465.9063,324.0469 466.5,323.7813 Q467.0938,323.5 467.7188,322.9219 L467.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="324.1543">Visitor2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="342"/>
       <ellipse cx="390" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="399" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="354.8047"/>
       <ellipse cx="390" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
       <ellipse cx="726.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,325.6406 Q729.1406,325.9375 728.5,326.0781 Q727.8594,326.2344 727.1563,326.2344 Q724.6563,326.2344 723.3281,324.5938 Q722.0156,322.9375 722.0156,319.8125 Q722.0156,316.6875 723.3281,315.0313 Q724.6563,313.375 727.1563,313.375 Q727.8594,313.375 728.5,313.5313 Q729.1563,313.6875 729.7188,313.9844 L729.7188,316.7031 Q729.0938,316.125 728.5,315.8594 Q727.9063,315.5781 727.2813,315.5781 Q725.9375,315.5781 725.25,316.6563 Q724.5625,317.7188 724.5625,319.8125 Q724.5625,321.9063 725.25,322.9844 Q725.9375,324.0469 727.2813,324.0469 Q727.9063,324.0469 728.5,323.7813 Q729.0938,323.5 729.7188,322.9219 L729.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="324.1543">Visitor3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="342"/>
       <ellipse cx="652" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="661" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="354.8047"/>
       <ellipse cx="652" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
       <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="46"/>
       <ellipse cx="360" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="193" x="369" y="54.2104">~Item() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="350" x2="635" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="66.8047"/>
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
       <ellipse cx="130.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,459.6406 Q132.6406,459.9375 132,460.0781 Q131.3594,460.2344 130.6563,460.2344 Q128.1563,460.2344 126.8281,458.5938 Q125.5156,456.9375 125.5156,453.8125 Q125.5156,450.6875 126.8281,449.0313 Q128.1563,447.375 130.6563,447.375 Q131.3594,447.375 132,447.5313 Q132.6563,447.6875 133.2188,447.9844 L133.2188,450.7031 Q132.5938,450.125 132,449.8594 Q131.4063,449.5781 130.7813,449.5781 Q129.4375,449.5781 128.75,450.6563 Q128.0625,451.7188 128.0625,453.8125 Q128.0625,455.9063 128.75,456.9844 Q129.4375,458.0469 130.7813,458.0469 Q131.4063,458.0469 132,457.7813 Q132.5938,457.5 133.2188,456.9219 L133.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="458.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="476"/>
       <ellipse cx="17" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="490.8047" y2="490.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhl7a99yv0jpw)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ct9xmpaz993o)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
       <ellipse cx="838.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,459.6406 Q840.6406,459.9375 840,460.0781 Q839.3594,460.2344 838.6563,460.2344 Q836.1563,460.2344 834.8281,458.5938 Q833.5156,456.9375 833.5156,453.8125 Q833.5156,450.6875 834.8281,449.0313 Q836.1563,447.375 838.6563,447.375 Q839.3594,447.375 840,447.5313 Q840.6563,447.6875 841.2188,447.9844 L841.2188,450.7031 Q840.5938,450.125 840,449.8594 Q839.4063,449.5781 838.7813,449.5781 Q837.4375,449.5781 836.75,450.6563 Q836.0625,451.7188 836.0625,453.8125 Q836.0625,455.9063 836.75,456.9844 Q837.4375,458.0469 838.7813,458.0469 Q839.4063,458.0469 840,457.7813 Q840.5938,457.5 841.2188,456.9219 L841.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="458.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="720" y="476"/>
       <ellipse cx="725" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="734" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="490.8047" y2="490.8047"/>
diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg
index 34d2e02e..8fe319e9 100644
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1066.421875 614" style="max-width: 1066.42px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1246.9453125 614" style="max-width: 1246.95px; background-color: white;" width="1246.9453125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,29 +50,64 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M454.953125,272.14872836916624L374.6276041666667,285.2906069743052C294.3020833333333,298.4324855794442,133.65104166666666,324.7162427897221,53.325520833333336,350.4414547281944C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-14.79170704134367,493.5833333333333C-2.583414082687341,510.3333333333333,21.83317183462532,518.6666666666666,34.04146479328165,522.8333333333334L46.24975775193798,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M682.921875,290.79745673833247L713.5859375,300.8312139486104C744.25,310.8649711588883,805.578125,330.9324855794442,836.2421875,353.54957612305543C866.90625,376.1666666666667,866.90625,401.3333333333333,866.90625,426.5C866.90625,451.6666666666667,866.90625,476.8333333333333,868.1982396640827,493.5833333333333C869.4902293281654,510.3333333333333,872.0742086563308,518.6666666666666,873.3661983204134,522.8333333333334L874.6581879844962,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M121.984375,477L121.984375,481.1666666666667C121.984375,485.3333333333333,121.984375,493.6666666666667,124.56835432816537,502C127.15233365633075,510.3333333333333,132.3202923126615,518.6666666666666,134.90427164082686,522.8333333333334L137.48825096899225,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M235.96875,437.75058727402717L344.4583333333333,448.458822728356C452.9479166666667,459.16705818268474,669.9270833333334,480.58352909134237,778.4166666666666,495.45843121233787C886.90625,510.3333333333333,886.90625,518.6666666666666,886.90625,522.8333333333334L886.90625,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M454.953125,278.3649711588883L399.4583333333333,290.47080929907355C343.9635416666667,302.57664743925886,232.97395833333334,326.78832371962943,177.47916666666666,343.0608285264814C121.984375,359.3333333333333,121.984375,367.6666666666667,121.984375,371.8333333333333L121.984375,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M305.96875,463.35946126819476L286.0533854166667,469.79955105682893C266.1380208333333,476.23964084546316,226.30729166666666,489.1198204227316,204.80974442829458,499.7265768780324C183.31219718992247,510.3333333333333,180.14783187984494,518.6666666666666,178.5656492248062,522.8333333333334L176.98346656976744,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M533.9375,444.17278998876947L596.0989583333334,453.81065832397456C658.2604166666666,463.4485266591796,782.5833333333334,482.7242633295898,843.452802002584,496.5287983314616C904.3222706718346,510.3333333333333,901.7382913436692,518.6666666666666,900.4463016795866,522.8333333333334L899.1543120155038,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M458.1542467948718,326L451.78739316239324,330.1666666666667C445.42053952991455,334.3333333333333,432.6868322649573,342.6666666666667,426.3199786324787,351C419.953125,359.3333333333333,419.953125,367.6666666666667,419.953125,371.8333333333333L419.953125,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M603.9375,443.32647216069654L537.6940104166666,453.1053934672471C471.4505208333333,462.8843147737977,338.9635416666667,482.4421573868988,269.8458797642119,496.38774536011607C200.72821786175712,510.3333333333333,194.97987322351423,518.6666666666666,192.10570090439276,522.8333333333334L189.23152858527132,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M831.90625,467.6792523364486L847.7395833333334,473.3993769470405C863.5729166666666,479.1195015576324,895.2395833333334,490.5597507788162,908.4889373385013,500.44654205607475C921.7382913436692,510.3333333333333,916.5703326873385,518.6666666666666,913.986353359173,522.8333333333334L911.4023740310078,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M679.7207532051282,326L686.0876068376068,330.1666666666667C692.4544604700855,334.3333333333333,705.1881677350426,342.6666666666667,711.5550213675214,351C717.921875,359.3333333333333,717.921875,367.6666666666667,717.921875,371.8333333333333L717.921875,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M568.9375,131L568.9375,135.16666666666666C568.9375,139.33333333333334,568.9375,147.66666666666666,568.9375,156C568.9375,164.33333333333334,568.9375,172.66666666666666,568.9375,176.83333333333334L568.9375,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M298.5,544.8629679401037L343.5729166666667,537.7191399500864C388.6458333333333,530.5753119600691,478.7916666666667,516.2876559800346,523.8645833333334,496.56049465668394C568.9375,476.8333333333333,568.9375,451.6666666666667,568.9375,426.5C568.9375,401.3333333333333,568.9375,376.1666666666667,568.9375,359.4166666666667C568.9375,342.6666666666667,568.9375,334.3333333333333,568.9375,330.1666666666667L568.9375,326"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M432.421875,109.13033560566335L405.5130208333333,116.94194633805279C378.6041666666667,124.75355707044223,324.7864583333333,140.37677853522112,297.8776041666667,164.43838926761057C270.96875,188.5,270.96875,221,270.96875,253.5C270.96875,286,270.96875,318.5,270.96875,347.3333333333333C270.96875,376.1666666666667,270.96875,401.3333333333333,270.96875,426.5C270.96875,451.6666666666667,270.96875,476.8333333333333,263.92841569767444,493.5833333333333C256.8880813953488,510.3333333333333,242.80741279069767,518.6666666666666,235.7670784883721,522.8333333333334L228.72674418604652,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M935.8984980620155,527L941.0664567183462,522.8333333333334C946.234415374677,518.6666666666666,956.5703326873385,510.3333333333333,961.7382913436692,493.5833333333333C966.90625,476.8333333333333,966.90625,451.6666666666667,966.90625,426.5C966.90625,401.3333333333333,966.90625,376.1666666666667,919.5755208333334,351.987583431488C872.2447916666666,327.80850019630935,777.5833333333334,304.61700039261876,730.2526041666666,293.02125049077347L682.921875,281.4255005889282"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M705.453125,100.74226953286482L745.6953125,109.95189127738736C785.9375,119.1615130219099,866.421875,137.58075651095496,906.6640625,163.04037825547746C946.90625,188.5,946.90625,221,946.90625,253.5C946.90625,286,946.90625,318.5,946.90625,347.3333333333333C946.90625,376.1666666666667,946.90625,401.3333333333333,946.90625,426.5C946.90625,451.6666666666667,946.90625,476.8333333333333,943.0302810077519,493.5833333333333C939.1543120155038,510.3333333333333,931.4023740310078,518.6666666666666,927.5264050387597,522.8333333333334L923.6504360465117,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M532.3203125,272.99368043449107L439.1002604166667,285.99473369540925C345.8802083333333,298.9957869563274,159.44010416666666,324.9978934781637,66.22005208333333,350.5822800724152C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-13.125746931524546,493.5833333333333C0.7485061369509083,510.3333333333333,28.497012273901817,518.6666666666666,42.37126534237727,522.8333333333334L56.245518410852725,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M811.8671875,292.48736086898214L846.8294270833334,302.23946739081845C881.7916666666666,311.99157391265476,951.7161458333334,331.4957869563274,986.6783854166666,353.83122681149706C1021.640625,376.1666666666667,1021.640625,401.3333333333333,1021.640625,426.5C1021.640625,451.6666666666667,1021.640625,476.8333333333333,1022.9326146640827,493.5833333333333C1024.2246043281655,510.3333333333333,1026.8085836563307,518.6666666666666,1028.1005733204136,522.8333333333334L1029.3925629844962,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M147.7734375,477L147.7734375,481.1666666666667C147.7734375,485.3333333333333,147.7734375,493.6666666666667,150.35741682816538,502C152.94139615633074,510.3333333333333,158.1093548126615,518.6666666666666,160.69333414082686,522.8333333333334L163.27731346899225,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M287.546875,438.30588646593543L413.2291666666667,448.9215720549462C538.9114583333334,459.53725764395693,790.2760416666666,480.76862882197844,915.9583333333334,495.55098107765593C1041.640625,510.3333333333333,1041.640625,518.6666666666666,1041.640625,522.8333333333334L1041.640625,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M532.3203125,279.49157391265476L468.2291666666667,291.4096449272123C404.1380208333333,303.32771594176984,275.9557291666667,327.1638579708849,211.86458333333334,343.2485956521091C147.7734375,359.3333333333333,147.7734375,367.6666666666667,147.7734375,371.8333333333333L147.7734375,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M357.546875,465.2745755170583L335.482421875,471.39547959754856C313.41796875,477.5163836780389,269.2890625,489.75819183901945,244.8094466650517,500.04576258617635C220.32983083010336,510.3333333333333,215.49950541020675,518.6666666666666,213.08434270025842,522.8333333333334L210.66917999031008,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M637.09375,445.2001855107776L707.8515625,454.6668212589813C778.609375,464.1334570071851,920.125,483.0667285035925,989.5908228359173,496.7000309184629C1059.0566456718345,510.3333333333333,1056.4726663436693,518.6666666666666,1055.1806766795864,522.8333333333334L1053.8886870155038,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M542.1340144230769,326L534.6650641025641,330.1666666666667C527.1961137820513,334.3333333333333,512.2582131410256,342.6666666666667,504.7892628205129,351C497.3203125,359.3333333333333,497.3203125,367.6666666666667,497.3203125,371.8333333333333L497.3203125,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M707.09375,444.0382602881126L630.1048177083334,453.6985502400939C553.1158854166666,463.3588401920751,399.1380208333333,482.6794200960376,318.4419361676357,496.5063767146855C237.74585150193798,510.3333333333333,230.33154675387595,518.6666666666666,226.62439437984494,522.8333333333334L222.91724200581396,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M986.640625,471.4492695750557L1002.4739583333334,476.5410579792131C1018.3072916666666,481.63284638337046,1049.9739583333333,491.81642319168526,1063.2233123385013,501.07487826250934C1076.4726663436693,510.3333333333333,1071.3047076873384,518.6666666666666,1068.720728359173,522.8333333333334L1066.1367490310076,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M802.0534855769231,326L809.5224358974359,330.1666666666667C816.9913862179487,334.3333333333333,831.9292868589743,342.6666666666667,839.3982371794872,351C846.8671875,359.3333333333333,846.8671875,367.6666666666667,846.8671875,371.8333333333333L846.8671875,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M672.09375,131L672.09375,135.16666666666666C672.09375,139.33333333333334,672.09375,147.66666666666666,672.09375,156C672.09375,164.33333333333334,672.09375,172.66666666666666,672.09375,176.83333333333334L672.09375,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M350.078125,544.884857967835L403.7473958333333,537.7373816398625C457.4166666666667,530.58990531189,564.7552083333334,516.294952655945,618.4244791666666,496.5641429946392C672.09375,476.8333333333333,672.09375,451.6666666666667,672.09375,426.5C672.09375,401.3333333333333,672.09375,376.1666666666667,672.09375,359.4166666666667C672.09375,342.6666666666667,672.09375,334.3333333333333,672.09375,330.1666666666667L672.09375,326"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M509.7890625,109.66444280541774L478.58203125,117.38703567118144C447.375,125.10962853694515,384.9609375,140.55481426847257,353.75390625,164.52740713423628C322.546875,188.5,322.546875,221,322.546875,253.5C322.546875,286,322.546875,318.5,322.546875,347.3333333333333C322.546875,376.1666666666667,322.546875,401.3333333333333,322.546875,426.5C322.546875,451.6666666666667,322.546875,476.8333333333333,313.8405805878553,493.5833333333333C305.1342861757106,510.3333333333333,287.7216973514212,518.6666666666666,279.0154029392765,522.8333333333334L270.3091085271318,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1090.6328730620155,527L1095.8008317183462,522.8333333333334C1100.968790374677,518.6666666666666,1111.3047076873384,510.3333333333333,1116.4726663436693,493.5833333333333C1121.640625,476.8333333333333,1121.640625,451.6666666666667,1121.640625,426.5C1121.640625,401.3333333333333,1121.640625,376.1666666666667,1070.01171875,352.38579501349733C1018.3828125,328.6049233603281,915.125,306.20984672065623,863.49609375,295.01230840082025L811.8671875,283.8147700809843"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M834.3984375,102.1841057073224L878.9388020833334,111.15342142276866C923.4791666666666,120.12273713821493,1012.5598958333334,138.06136856910746,1057.1002604166667,163.28068428455373C1101.640625,188.5,1101.640625,221,1101.640625,253.5C1101.640625,286,1101.640625,318.5,1101.640625,347.3333333333333C1101.640625,376.1666666666667,1101.640625,401.3333333333333,1101.640625,426.5C1101.640625,451.6666666666667,1101.640625,476.8333333333333,1097.764656007752,493.5833333333333C1093.8886870155038,510.3333333333333,1086.1367490310079,518.6666666666666,1082.2607800387598,522.8333333333334L1078.3848110465117,527"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -86,11 +121,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -104,11 +152,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -122,11 +183,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -140,65 +214,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -214,11 +236,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(568.9375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L9">
+        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L9">
           <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
-            <rect height="145" width="227.96875" y="-72.5" x="-113.984375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="113.984375" x1="-113.984375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="113.984375" x1="-113.984375" class="divider"/>
+            <rect height="145" width="279.546875" y="-72.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -230,29 +252,29 @@
                   <span class="nodeLabel">Visitor</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 3)" height="18" width="116.203125">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="251.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Visitor() : void</span>
+                  <span class="nodeLabel">+~Visitor() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 25)" height="18" width="211.78125">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="263.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 47)" height="18" width="212.96875">
+              <foreignObject transform="translate( -132.2734375, 47)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(121.984375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L16">
+        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L16">
           <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
-            <rect height="101" width="227.96875" y="-50.5" x="-113.984375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="113.984375" x1="-113.984375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="113.984375" x1="-113.984375" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -264,24 +286,24 @@
                   <span class="nodeLabel">Visitor1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 3)" height="18" width="211.203125">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 25)" height="18" width="212.96875">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(419.953125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L22">
+        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L22">
           <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
-            <rect height="101" width="227.96875" y="-50.5" x="-113.984375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="113.984375" x1="-113.984375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="113.984375" x1="-113.984375" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -293,24 +315,24 @@
                   <span class="nodeLabel">Visitor2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 3)" height="18" width="211.203125">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 25)" height="18" width="212.96875">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(717.921875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L28">
+        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L28">
           <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
-            <rect height="101" width="227.96875" y="-50.5" x="-113.984375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="113.984375" x1="-113.984375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="113.984375" x1="-113.984375" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -322,24 +344,24 @@
                   <span class="nodeLabel">Visitor3</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 3)" height="18" width="211.203125">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -106.484375, 25)" height="18" width="212.96875">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(568.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L34">
+        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L34">
           <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
-            <rect height="123" width="273.03125" y="-61.5" x="-136.515625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="136.515625" x1="-136.515625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="136.515625" x1="-136.515625" class="divider"/>
+            <rect height="123" width="324.609375" y="-61.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -351,24 +373,24 @@
                   <span class="nodeLabel">Item</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -129.015625, 14)" height="18" width="103.15625">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="238.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Item() : void</span>
+                  <span class="nodeLabel">+~Item() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -129.015625, 36)" height="18" width="258.03125">
+              <foreignObject transform="translate( -154.8046875, 36)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(161.984375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L40">
+        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L40">
           <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
-            <rect height="79" width="273.03125" y="-39.5" x="-136.515625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="136.515625" x1="-136.515625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="136.515625" x1="-136.515625" class="divider"/>
+            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -380,19 +402,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -129.015625, 14)" height="18" width="258.03125">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(886.90625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00021/t00021.cc#L45">
+        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00021/t00021.cc#L45">
           <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
-            <rect height="79" width="273.03125" y="-39.5" x="-136.515625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="136.515625" x1="-136.515625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="136.515625" x1="-136.515625" class="divider"/>
+            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -404,9 +426,9 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -129.015625, 14)" height="18" width="258.03125">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md
index fc763b8e..8556cb6d 100644
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -320,7 +320,7 @@ protected:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index e7fda857..e5036a25 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_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="238px" preserveAspectRatio="none" style="width:290px;height:238px;" version="1.1" viewBox="0 0 290 238" width="290px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhkt7p5hev0xq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fo0iye4m2wnde" 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"/>
@@ -9,76 +9,76 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhkt7p5hev0xq)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0iye4m2wnde)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
       <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="46"/>
       <polygon fill="#FFFF44" points="69.5,46,73.5,50,69.5,54,65.5,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="54.2104">method1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="58.8047"/>
       <polygon fill="#FFFF44" points="69.5,58.8047,73.5,62.8047,69.5,66.8047,65.5,62.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="67.0151">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="71.6094"/>
       <ellipse cx="69.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="78.5" y="79.8198">template_method() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="86.4141" y2="86.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhkt7p5hev0xq)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0iye4m2wnde)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
       <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
       <polygon fill="#FFFF44" points="17,192,21,196,17,200,13,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
       <polygon fill="#FFFF44" points="17,204.8047,21,208.8047,17,212.8047,13,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="219.6094" y2="219.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhkt7p5hev0xq)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0iye4m2wnde)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
       <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="192"/>
       <polygon fill="#FFFF44" points="171,192,175,196,171,200,167,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="204.8047"/>
       <polygon fill="#FFFF44" points="171,204.8047,175,208.8047,171,212.8047,167,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="219.6094" y2="219.6094"/>
diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg
index c275fa85..90f77c1b 100644
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 345.03125 312" style="max-width: 345.031px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 345.03125 312" style="max-width: 345.031px; background-color: white;" width="345.03125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L6">
+        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L6">
           <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
             <rect height="145" width="201.328125" y="-72.5" x="-100.6640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
@@ -108,7 +108,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L19">
+        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L19">
           <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
@@ -137,7 +137,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00022/t00022.cc#L25">
+        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00022/t00022.cc#L25">
           <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md
index 28f32d60..c4fb4c92 100644
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -400,7 +400,7 @@ private:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index 673fc00d..0b30fab2 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_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="393px" preserveAspectRatio="none" style="width:456px;height:393px;" version="1.1" viewBox="0 0 456 393" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6i2fvb33ongn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f9mdy5nzskdn1" 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"/>
@@ -9,102 +9,102 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6i2fvb33ongn)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9mdy5nzskdn1)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
       <ellipse cx="194.25" cy="195" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,190.3438 L193.2031,195.4219 L195.5313,195.4219 L194.3594,190.3438 Z M192.875,188.1094 L195.8594,188.1094 L199.2188,200.5 L196.7656,200.5 L196,197.4375 L192.7188,197.4375 L191.9688,200.5 L189.5313,200.5 L192.875,188.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="199.1543">Strategy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="217"/>
       <ellipse cx="115.5" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="124.5" y="225.2104">~Strategy() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="105.5" x2="345.5" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="237.8047"/>
       <ellipse cx="115.5" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="124.5" y="246.0151">algorithm() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="252.6094" y2="252.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6i2fvb33ongn)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9mdy5nzskdn1)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
       <ellipse cx="34.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,343.6406 Q36.8906,343.9375 36.25,344.0781 Q35.6094,344.2344 34.9063,344.2344 Q32.4063,344.2344 31.0781,342.5938 Q29.7656,340.9375 29.7656,337.8125 Q29.7656,334.6875 31.0781,333.0313 Q32.4063,331.375 34.9063,331.375 Q35.6094,331.375 36.25,331.5313 Q36.9063,331.6875 37.4688,331.9844 L37.4688,334.7031 Q36.8438,334.125 36.25,333.8594 Q35.6563,333.5781 35.0313,333.5781 Q33.6875,333.5781 33,334.6563 Q32.3125,335.7188 32.3125,337.8125 Q32.3125,339.9063 33,340.9844 Q33.6875,342.0469 35.0313,342.0469 Q35.6563,342.0469 36.25,341.7813 Q36.8438,341.5 37.4688,340.9219 L37.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="342.1543">StrategyA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360"/>
       <ellipse cx="17" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6i2fvb33ongn)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9mdy5nzskdn1)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
       <ellipse cx="192.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,343.6406 Q194.8906,343.9375 194.25,344.0781 Q193.6094,344.2344 192.9063,344.2344 Q190.4063,344.2344 189.0781,342.5938 Q187.7656,340.9375 187.7656,337.8125 Q187.7656,334.6875 189.0781,333.0313 Q190.4063,331.375 192.9063,331.375 Q193.6094,331.375 194.25,331.5313 Q194.9063,331.6875 195.4688,331.9844 L195.4688,334.7031 Q194.8438,334.125 194.25,333.8594 Q193.6563,333.5781 193.0313,333.5781 Q191.6875,333.5781 191,334.6563 Q190.3125,335.7188 190.3125,337.8125 Q190.3125,339.9063 191,340.9844 Q191.6875,342.0469 193.0313,342.0469 Q193.6563,342.0469 194.25,341.7813 Q194.8438,341.5 195.4688,340.9219 L195.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="342.1543">StrategyB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="170" y="360"/>
       <ellipse cx="175" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6i2fvb33ongn)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9mdy5nzskdn1)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
       <ellipse cx="350.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,343.6406 Q352.8906,343.9375 352.25,344.0781 Q351.6094,344.2344 350.9063,344.2344 Q348.4063,344.2344 347.0781,342.5938 Q345.7656,340.9375 345.7656,337.8125 Q345.7656,334.6875 347.0781,333.0313 Q348.4063,331.375 350.9063,331.375 Q351.6094,331.375 352.25,331.5313 Q352.9063,331.6875 353.4688,331.9844 L353.4688,334.7031 Q352.8438,334.125 352.25,333.8594 Q351.6563,333.5781 351.0313,333.5781 Q349.6875,333.5781 349,334.6563 Q348.3125,335.7188 348.3125,337.8125 Q348.3125,339.9063 349,340.9844 Q349.6875,342.0469 351.0313,342.0469 Q351.6563,342.0469 352.25,341.7813 Q352.8438,341.5 353.4688,340.9219 L353.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="342.1543">StrategyC</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="328" y="360"/>
       <ellipse cx="333" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6i2fvb33ongn)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9mdy5nzskdn1)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
       <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <ellipse cx="79" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="289" x="88" y="54.2104">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="66.8047"/>
       <ellipse cx="79" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="88" y="75.0151">apply() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="87.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="89.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="95.8198">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg
index 2d2898c6..012d3109 100644
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 546.5 459" style="max-width: 546.5px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 546.5 459" style="max-width: 546.5px; background-color: white;" width="546.5" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,9 +50,9 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M199.9375,293.27277131782944L179.90625,302.22730943152453C159.875,311.1818475452196,119.8125,329.0909237726098,99.78125,342.21212855297154C79.75,355.3333333333333,79.75,363.6666666666667,79.75,367.8333333333333L79.75,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.67485549132948,322L126.35404624277457,326.1666666666667C117.03323699421965,330.3333333333333,98.39161849710983,338.6666666666667,89.07080924855491,347C79.75,355.3333333333333,79.75,363.6666666666667,79.75,367.8333333333333L79.75,372"/>
         <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M273.25,322L273.25,326.1666666666667C273.25,330.3333333333333,273.25,338.6666666666667,273.25,347C273.25,355.3333333333333,273.25,363.6666666666667,273.25,367.8333333333333L273.25,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M346.5625,293.27277131782944L366.59375,302.22730943152453C386.625,311.1818475452196,426.6875,329.0909237726098,446.71875,342.21212855297154C466.75,355.3333333333333,466.75,363.6666666666667,466.75,367.8333333333333L466.75,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M410.8251445086705,322L420.14595375722547,326.1666666666667C429.46676300578036,330.3333333333333,448.10838150289015,338.6666666666667,457.4291907514451,347C466.75,355.3333333333333,466.75,363.6666666666667,466.75,367.8333333333333L466.75,372"/>
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M273.25,131L273.25,136.66666666666666C273.25,142.33333333333334,273.25,153.66666666666666,273.25,165C273.25,176.33333333333334,273.25,187.66666666666666,273.25,193.33333333333334L273.25,199"/>
       </g>
       <g class="edgeLabels">
@@ -96,11 +96,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L6">
+        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L6">
           <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
-            <rect height="123" width="146.625" y="-61.5" x="-73.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="73.3125" x1="-73.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="73.3125" x1="-73.3125" class="divider"/>
+            <rect height="123" width="281.8125" y="-61.5" x="-140.90625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="140.90625" x1="-140.90625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="140.90625" x1="-140.90625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -112,12 +112,12 @@
                   <span class="nodeLabel">Strategy</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.8125, 14)" height="18" width="131.625">
+              <foreignObject transform="translate( -133.40625, 14)" height="18" width="266.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Strategy() : void</span>
+                  <span class="nodeLabel">+~Strategy() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.8125, 36)" height="18" width="128.5">
+              <foreignObject transform="translate( -133.40625, 36)" height="18" width="128.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
                   <span style="font-style:italic;" class="nodeLabel">+algorithm() : void</span>
                 </div>
@@ -125,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L12">
+        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L12">
           <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L17">
+        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L17">
           <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L22">
+        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L22">
           <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -197,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00023/t00023.cc#L27">
+        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00023/t00023.cc#L27">
           <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
             <rect height="123" width="300.046875" y="-61.5" x="-150.0234375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md
index 15793475..1acf38a3 100644
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -451,7 +451,7 @@ private:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index e4a72557..0f7f46b6 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_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="297px" preserveAspectRatio="none" style="width:542px;height:297px;" version="1.1" viewBox="0 0 542 297" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fblvjrxkziz3c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f188o6s3vm0ef8" 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"/>
@@ -9,115 +9,115 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fblvjrxkziz3c)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f188o6s3vm0ef8)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
       <ellipse cx="181.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M181.8594,19.3438 L180.7031,24.4219 L183.0313,24.4219 L181.8594,19.3438 Z M180.375,17.1094 L183.3594,17.1094 L186.7188,29.5 L184.2656,29.5 L183.5,26.4375 L180.2188,26.4375 L179.4688,29.5 L177.0313,29.5 L180.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="202.25" y="28.1543">Target</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="46"/>
       <ellipse cx="147.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="156.5" y="54.2104">~Target() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="137.5" x2="275.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="66.8047"/>
       <ellipse cx="147.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="75.0151">m1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="79.6094"/>
       <ellipse cx="147.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="87.8198">m2() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fblvjrxkziz3c)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f188o6s3vm0ef8)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
       <ellipse cx="23.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,217.1406 Q26.0906,217.4375 25.45,217.5781 Q24.8094,217.7344 24.1063,217.7344 Q21.6063,217.7344 20.2781,216.0938 Q18.9656,214.4375 18.9656,211.3125 Q18.9656,208.1875 20.2781,206.5313 Q21.6063,204.875 24.1063,204.875 Q24.8094,204.875 25.45,205.0313 Q26.1063,205.1875 26.6688,205.4844 L26.6688,208.2031 Q26.0438,207.625 25.45,207.3594 Q24.8563,207.0781 24.2313,207.0781 Q22.8875,207.0781 22.2,208.1563 Q21.5125,209.2188 21.5125,211.3125 Q21.5125,213.4063 22.2,214.4844 Q22.8875,215.5469 24.2313,215.5469 Q24.8563,215.5469 25.45,215.2813 Q26.0438,215 26.6688,214.4219 L26.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="215.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="233.5"/>
       <ellipse cx="17" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="246.3047"/>
       <ellipse cx="17" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fblvjrxkziz3c)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f188o6s3vm0ef8)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
       <ellipse cx="145.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,217.1406 Q148.0906,217.4375 147.45,217.5781 Q146.8094,217.7344 146.1063,217.7344 Q143.6063,217.7344 142.2781,216.0938 Q140.9656,214.4375 140.9656,211.3125 Q140.9656,208.1875 142.2781,206.5313 Q143.6063,204.875 146.1063,204.875 Q146.8094,204.875 147.45,205.0313 Q148.1063,205.1875 148.6688,205.4844 L148.6688,208.2031 Q148.0438,207.625 147.45,207.3594 Q146.8563,207.0781 146.2313,207.0781 Q144.8875,207.0781 144.2,208.1563 Q143.5125,209.2188 143.5125,211.3125 Q143.5125,213.4063 144.2,214.4844 Q144.8875,215.5469 146.2313,215.5469 Q146.8563,215.5469 147.45,215.2813 Q148.0438,215 148.6688,214.4219 L148.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="215.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="233.5"/>
       <ellipse cx="139" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="246.3047"/>
       <ellipse cx="139" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fblvjrxkziz3c)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f188o6s3vm0ef8)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
       <ellipse cx="369.75" cy="195" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,200.6406 Q372.1406,200.9375 371.5,201.0781 Q370.8594,201.2344 370.1563,201.2344 Q367.6563,201.2344 366.3281,199.5938 Q365.0156,197.9375 365.0156,194.8125 Q365.0156,191.6875 366.3281,190.0313 Q367.6563,188.375 370.1563,188.375 Q370.8594,188.375 371.5,188.5313 Q372.1563,188.6875 372.7188,188.9844 L372.7188,191.7031 Q372.0938,191.125 371.5,190.8594 Q370.9063,190.5781 370.2813,190.5781 Q368.9375,190.5781 368.25,191.6563 Q367.5625,192.7188 367.5625,194.8125 Q367.5625,196.9063 368.25,197.9844 Q368.9375,199.0469 370.2813,199.0469 Q370.9063,199.0469 371.5,198.7813 Q372.0938,198.5 372.7188,197.9219 L372.7188,200.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="199.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="217"/>
       <ellipse cx="261" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="255" x="270" y="225.2104">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="251" x2="530" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="237.8047"/>
       <ellipse cx="261" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="246.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="250.6094"/>
       <ellipse cx="261" cy="255.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="258.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="265.4141" y2="265.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="271.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="273.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="279.6245">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg
index 118279bb..e4f10d43 100644
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 586.515625 374" style="max-width: 586.516px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 586.515625 374" style="max-width: 586.516px; background-color: white;" width="586.515625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -96,7 +96,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L6">
+        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L6">
           <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
             <rect height="145" width="131.8125" y="-72.5" x="-65.90625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.90625" x1="-65.90625" class="divider"/>
@@ -130,7 +130,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L14">
+        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L14">
           <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -159,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L20">
+        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L20">
           <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00024/t00024.cc#L26">
+        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00024/t00024.cc#L26">
           <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md
index ae1b5f29..15ccdb9b 100644
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -442,7 +442,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index af0adb76..dd6d260b 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_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="386px" preserveAspectRatio="none" style="width:512px;height:386px;" version="1.1" viewBox="0 0 512 386" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mlwmrew8jsgw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fqmjjofqsrz1c" 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"/>
@@ -9,52 +9,52 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
       <ellipse cx="23.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,306.1406 Q26.0906,306.4375 25.45,306.5781 Q24.8094,306.7344 24.1063,306.7344 Q21.6063,306.7344 20.2781,305.0938 Q18.9656,303.4375 18.9656,300.3125 Q18.9656,297.1875 20.2781,295.5313 Q21.6063,293.875 24.1063,293.875 Q24.8094,293.875 25.45,294.0313 Q26.1063,294.1875 26.6688,294.4844 L26.6688,297.2031 Q26.0438,296.625 25.45,296.3594 Q24.8563,296.0781 24.2313,296.0781 Q22.8875,296.0781 22.2,297.1563 Q21.5125,298.2188 21.5125,300.3125 Q21.5125,302.4063 22.2,303.4844 Q22.8875,304.5469 24.2313,304.5469 Q24.8563,304.5469 25.45,304.2813 Q26.0438,304 26.6688,303.4219 L26.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="304.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.5"/>
       <ellipse cx="17" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.3047"/>
       <ellipse cx="17" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
       <ellipse cx="431.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M434.6688,306.1406 Q434.0906,306.4375 433.45,306.5781 Q432.8094,306.7344 432.1063,306.7344 Q429.6063,306.7344 428.2781,305.0938 Q426.9656,303.4375 426.9656,300.3125 Q426.9656,297.1875 428.2781,295.5313 Q429.6063,293.875 432.1063,293.875 Q432.8094,293.875 433.45,294.0313 Q434.1063,294.1875 434.6688,294.4844 L434.6688,297.2031 Q434.0438,296.625 433.45,296.3594 Q432.8563,296.0781 432.2313,296.0781 Q430.8875,296.0781 430.2,297.1563 Q429.5125,298.2188 429.5125,300.3125 Q429.5125,302.4063 430.2,303.4844 Q430.8875,304.5469 432.2313,304.5469 Q432.8563,304.5469 433.45,304.2813 Q434.0438,304 434.6688,303.4219 L434.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="304.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="322.5"/>
       <ellipse cx="425" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="335.3047"/>
       <ellipse cx="425" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
       <ellipse cx="227.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.2188,289.6406 Q229.6406,289.9375 229,290.0781 Q228.3594,290.2344 227.6563,290.2344 Q225.1563,290.2344 223.8281,288.5938 Q222.5156,286.9375 222.5156,283.8125 Q222.5156,280.6875 223.8281,279.0313 Q225.1563,277.375 227.6563,277.375 Q228.3594,277.375 229,277.5313 Q229.6563,277.6875 230.2188,277.9844 L230.2188,280.7031 Q229.5938,280.125 229,279.8594 Q228.4063,279.5781 227.7813,279.5781 Q226.4375,279.5781 225.75,280.6563 Q225.0625,281.7188 225.0625,283.8125 Q225.0625,285.9063 225.75,286.9844 Q226.4375,288.0469 227.7813,288.0469 Q228.4063,288.0469 229,287.7813 Q229.5938,287.5 230.2188,286.9219 L230.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="247.75" y="288.1543">Proxy</text>
@@ -62,38 +62,38 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="374" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="306"/>
       <ellipse cx="139" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="148" y="314.2104">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="129" x2="378" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="326.8047"/>
       <ellipse cx="139" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="335.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="339.6094"/>
       <ellipse cx="139" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="347.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="354.4141" y2="354.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="360.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="362.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="368.6245">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
       <ellipse cx="105.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M108.4688,180.6406 Q107.8906,180.9375 107.25,181.0781 Q106.6094,181.2344 105.9063,181.2344 Q103.4063,181.2344 102.0781,179.5938 Q100.7656,177.9375 100.7656,174.8125 Q100.7656,171.6875 102.0781,170.0313 Q103.4063,168.375 105.9063,168.375 Q106.6094,168.375 107.25,168.5313 Q107.9063,168.6875 108.4688,168.9844 L108.4688,171.7031 Q107.8438,171.125 107.25,170.8594 Q106.6563,170.5781 106.0313,170.5781 Q104.6875,170.5781 104,171.6563 Q103.3125,172.7188 103.3125,174.8125 Q103.3125,176.9063 104,177.9844 Q104.6875,179.0469 106.0313,179.0469 Q106.6563,179.0469 107.25,178.7813 Q107.8438,178.5 108.4688,177.9219 L108.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="119.5" y="179.1543">Proxy</text>
@@ -102,8 +102,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
       <ellipse cx="258.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M261.4688,180.6406 Q260.8906,180.9375 260.25,181.0781 Q259.6094,181.2344 258.9063,181.2344 Q256.4063,181.2344 255.0781,179.5938 Q253.7656,177.9375 253.7656,174.8125 Q253.7656,171.6875 255.0781,170.0313 Q256.4063,168.375 258.9063,168.375 Q259.6094,168.375 260.25,168.5313 Q260.9063,168.6875 261.4688,168.9844 L261.4688,171.7031 Q260.8438,171.125 260.25,170.8594 Q259.6563,170.5781 259.0313,170.5781 Q257.6875,170.5781 257,171.6563 Q256.3125,172.7188 256.3125,174.8125 Q256.3125,176.9063 257,177.9844 Q257.6875,179.0469 259.0313,179.0469 Q259.6563,179.0469 260.25,178.7813 Q260.8438,178.5 261.4688,177.9219 L261.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="272.5" y="179.1543">Proxy</text>
@@ -112,26 +112,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlwmrew8jsgw)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqmjjofqsrz1c)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
       <ellipse cx="184.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M187.3188,29.6406 Q186.7406,29.9375 186.1,30.0781 Q185.4594,30.2344 184.7563,30.2344 Q182.2563,30.2344 180.9281,28.5938 Q179.6156,26.9375 179.6156,23.8125 Q179.6156,20.6875 180.9281,19.0313 Q182.2563,17.375 184.7563,17.375 Q185.4594,17.375 186.1,17.5313 Q186.7563,17.6875 187.3188,17.9844 L187.3188,20.7031 Q186.6938,20.125 186.1,19.8594 Q185.5063,19.5781 184.8813,19.5781 Q183.5375,19.5781 182.85,20.6563 Q182.1625,21.7188 182.1625,23.8125 Q182.1625,25.9063 182.85,26.9844 Q183.5375,28.0469 184.8813,28.0469 Q185.5063,28.0469 186.1,27.7813 Q186.6938,27.5 187.3188,26.9219 L187.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="204.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="54"/>
       <ellipse cx="152" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="62.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="66.8047"/>
       <ellipse cx="152" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="75.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0001644966842838139424-&gt;C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg
index 68e5828d..60883db7 100644
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 601.359375 437" style="max-width: 601.359px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 601.359375 437" style="max-width: 601.359px; background-color: white;" width="601.359375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -58,38 +58,46 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M400.0078125,95.75407448505445L421.0026041666667,103.62839540421203C441.9973958333333,111.50271632336963,483.9869791666667,127.25135816168482,504.9817708333333,140.79234574750907C525.9765625,154.33333333333334,525.9765625,165.66666666666666,525.9765625,171.33333333333334L525.9765625,177"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -118,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L6">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L6">
           <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -147,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L12">
+        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L12">
           <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -176,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18">
+        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
@@ -215,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -234,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L18">
+        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -253,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00025/t00025.cc#L31">
+        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00025/t00025.cc#L31">
           <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md
index 33f19e1a..3bfa639b 100644
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -582,7 +582,7 @@ struct StringMemento {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index f7c9cfb5..3c3444f7 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_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="583px" preserveAspectRatio="none" style="width:690px;height:583px;" version="1.1" viewBox="0 0 690 583" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5iu5im8s9fuc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11hxh65nrowec" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
       <ellipse cx="366.45" cy="494" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4188,499.6406 Q368.8406,499.9375 368.2,500.0781 Q367.5594,500.2344 366.8563,500.2344 Q364.3563,500.2344 363.0281,498.5938 Q361.7156,496.9375 361.7156,493.8125 Q361.7156,490.6875 363.0281,489.0313 Q364.3563,487.375 366.8563,487.375 Q367.5594,487.375 368.2,487.5313 Q368.8563,487.6875 369.4188,487.9844 L369.4188,490.7031 Q368.7938,490.125 368.2,489.8594 Q367.6063,489.5781 366.9813,489.5781 Q365.6375,489.5781 364.95,490.6563 Q364.2625,491.7188 364.2625,493.8125 Q364.2625,495.9063 364.95,496.9844 Q365.6375,498.0469 366.9813,498.0469 Q367.6063,498.0469 368.2,497.7813 Q368.7938,497.5 369.4188,496.9219 L369.4188,499.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="386.55" y="498.1543">Memento</text>
@@ -18,31 +18,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="481" y="487.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="510" y2="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="516"/>
       <ellipse cx="335" cy="521" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="344" y="524.2104">Memento(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="325" x2="485" y1="530.8047" y2="530.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="536.8047"/>
       <ellipse cx="335" cy="541.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="344" y="545.0151">value() const : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="551.6094" y2="551.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="557.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="332" y="559.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="344" y="565.8198">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
       <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
@@ -50,52 +50,52 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="671.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <ellipse cx="442.5" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="451.5" y="314.2104">Originator(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="326.8047"/>
       <ellipse cx="442.5" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="451.5" y="335.0151">load(const Memento&lt;T&gt; &amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="339.6094"/>
       <ellipse cx="442.5" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="352.4141"/>
       <ellipse cx="442.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="360.6245">print() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="365.2188"/>
       <ellipse cx="442.5" cy="370.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="373.4292">set(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="380.0234" y2="380.0234"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="386.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="388.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="394.2339">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
       <ellipse cx="160.25" cy="307.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,313.1406 Q162.6406,313.4375 162,313.5781 Q161.3594,313.7344 160.6563,313.7344 Q158.1563,313.7344 156.8281,312.0938 Q155.5156,310.4375 155.5156,307.3125 Q155.5156,304.1875 156.8281,302.5313 Q158.1563,300.875 160.6563,300.875 Q161.3594,300.875 162,301.0313 Q162.6563,301.1875 163.2188,301.4844 L163.2188,304.2031 Q162.5938,303.625 162,303.3594 Q161.4063,303.0781 160.7813,303.0781 Q159.4375,303.0781 158.75,304.1563 Q158.0625,305.2188 158.0625,307.3125 Q158.0625,309.4063 158.75,310.4844 Q159.4375,311.5469 160.7813,311.5469 Q161.4063,311.5469 162,311.2813 Q162.5938,311 163.2188,310.4219 L163.2188,313.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="311.6543">Caretaker</text>
@@ -103,30 +103,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="300.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="323.5" y2="323.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="329.5"/>
       <ellipse cx="17" cy="334.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="337.7104">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="342.3047"/>
       <ellipse cx="17" cy="347.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="350.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="357.1094" y2="357.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="363.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="365.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="371.3198">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
       <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
@@ -135,8 +135,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
       <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
@@ -145,26 +145,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5iu5im8s9fuc)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11hxh65nrowec)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
       <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="54"/>
       <ellipse cx="313.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="62.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="66.8047"/>
       <ellipse cx="313.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="75.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0001324770803720816727-&gt;C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg
index 90054c70..e40562f5 100644
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 782.984375 672" style="max-width: 782.984px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 834.5625 672" style="max-width: 834.562px; background-color: white;" width="834.5625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,24 +50,26 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M135.7734375,473L135.7734375,478.6666666666667C135.7734375,484.3333333333333,135.7734375,495.6666666666667,153.80533854166666,509.76456703705827C171.83723958333334,523.8624674074499,207.90104166666666,540.7249348148998,225.93294270833334,549.1561685186248L243.96484375,557.5874022223497"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M544.265625,440L544.265625,451.1666666666667C544.265625,462.3333333333333,544.265625,484.6666666666667,526.2337239583334,504.26456703705827C508.2018229166667,523.8624674074499,472.1380208333333,540.7249348148998,454.1061197916667,549.1561685186248L436.07421875,557.5874022223497"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M544.265625,234L544.265625,238.16666666666666C544.265625,242.33333333333334,544.265625,250.66666666666666,544.265625,264.5C544.265625,278.3333333333333,544.265625,297.6666666666667,544.265625,307.3333333333333L544.265625,317"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M135.7734375,234L135.7734375,238.16666666666666C135.7734375,242.33333333333334,135.7734375,250.66666666666666,135.7734375,259C135.7734375,267.3333333333333,135.7734375,275.6666666666667,135.7734375,279.8333333333333L135.7734375,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M462.0837647928994,109L475.7807414940828,114.66666666666667C489.4777181952663,120.33333333333333,516.871671597633,131.66666666666666,530.5686482988166,143C544.265625,154.33333333333334,544.265625,165.66666666666666,544.265625,171.33333333333334L544.265625,177"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M217.9552977071006,109L204.2583210059172,114.66666666666667C190.56134430473375,120.33333333333333,163.16739090236686,131.66666666666666,149.47041420118344,143C135.7734375,154.33333333333334,135.7734375,165.66666666666666,135.7734375,171.33333333333334L135.7734375,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M161.5625,473L161.5625,478.6666666666667C161.5625,484.3333333333333,161.5625,495.6666666666667,181.74348958333334,510.2090768990909C201.92447916666666,524.7514871315152,242.28645833333334,542.5029742630304,262.4674479166667,551.378717828788L282.6484375,560.2544613945456"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M595.84375,440L595.84375,451.1666666666667C595.84375,462.3333333333333,595.84375,484.6666666666667,575.6627604166666,504.7090768990909C555.4817708333334,524.7514871315152,515.1197916666666,542.5029742630304,494.9388020833333,551.378717828788L474.7578125,560.2544613945456"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M595.84375,234L595.84375,238.16666666666666C595.84375,242.33333333333334,595.84375,250.66666666666666,595.84375,264.5C595.84375,278.3333333333333,595.84375,297.6666666666667,595.84375,307.3333333333333L595.84375,317"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M161.5625,234L161.5625,238.16666666666666C161.5625,242.33333333333334,161.5625,250.66666666666666,161.5625,259C161.5625,267.3333333333333,161.5625,275.6666666666667,161.5625,279.8333333333333L161.5625,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M508.4735576923077,109L523.0352564102565,114.66666666666667C537.5969551282051,120.33333333333333,566.7203525641025,131.66666666666666,581.2820512820513,143C595.84375,154.33333333333334,595.84375,165.66666666666666,595.84375,171.33333333333334L595.84375,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.93269230769232,109L234.37099358974362,114.66666666666667C219.8092948717949,120.33333333333333,190.68589743589746,131.66666666666666,176.12419871794873,143C161.5625,154.33333333333334,161.5625,165.66666666666666,161.5625,171.33333333333334L161.5625,177"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(544.265625, 507)" class="edgeLabel">
+        <g transform="translate(595.84375, 507)" class="edgeLabel">
           <g transform="translate(-51.125, -9)" class="label">
             <foreignObject height="18" width="102.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -78,25 +80,29 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(544.265625, 143)" class="edgeLabel">
+        <g transform="translate(595.84375, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -107,7 +113,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(135.7734375, 143)" class="edgeLabel">
+        <g transform="translate(161.5625, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -120,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(340.01953125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L8">
+        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L8">
           <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
             <rect height="123" width="192.109375" y="-61.5" x="-96.0546875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
@@ -146,19 +152,19 @@
                   <span class="nodeLabel">+Memento(T &amp;&amp; v) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -88.5546875, 36)" height="18" width="81.078125">
+              <foreignObject transform="translate( -88.5546875, 36)" height="18" width="132.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+value() : T</span>
+                  <span class="nodeLabel">+value() : [const] T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(135.7734375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
-            <rect height="189" width="255.546875" y="-94.5" x="-127.7734375" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="127.7734375" x1="-127.7734375" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="127.7734375" x1="-127.7734375" class="divider"/>
+            <rect height="189" width="307.125" y="-94.5" x="-153.5625" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="153.5625" x1="-153.5625" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="153.5625" x1="-153.5625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -170,32 +176,32 @@
                   <span class="nodeLabel">Originator&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, -53)" height="18" width="88.625">
+              <foreignObject transform="translate( -146.0625, -53)" height="18" width="88.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_value : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, -19)" height="18" width="180.65625">
+              <foreignObject transform="translate( -146.0625, -19)" height="18" width="180.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+Originator(T &amp;&amp; v) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, 3)" height="18" width="235.21875">
+              <foreignObject transform="translate( -146.0625, 3)" height="18" width="235.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+load(const Memento &amp; m) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, 25)" height="18" width="240.546875">
+              <foreignObject transform="translate( -146.0625, 25)" height="18" width="292.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+memoize_value() : Memento&lt;T&gt;</span>
+                  <span class="nodeLabel">+memoize_value() : [const] Memento&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, 47)" height="18" width="93.8125">
+              <foreignObject transform="translate( -146.0625, 47)" height="18" width="145.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+print() : void</span>
+                  <span class="nodeLabel">+print() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.2734375, 69)" height="18" width="131.75">
+              <foreignObject transform="translate( -146.0625, 69)" height="18" width="131.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+set(T &amp;&amp; v) : void</span>
                 </div>
@@ -203,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(544.265625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
             <rect height="123" width="461.4375" y="-61.5" x="-230.71875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -237,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(544.265625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
             <rect height="57" width="186.625" y="-28.5" x="-93.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -256,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(135.7734375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
             <rect height="57" width="190.125" y="-28.5" x="-95.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -275,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(340.01953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00026/t00026.cc#L53">
+        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00026/t00026.cc#L53">
           <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
             <rect height="101" width="262.6875" y="-50.5" x="-131.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="131.34375" x1="-131.34375" class="divider"/>
diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md
index f7ff0cff..fd520716 100644
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -710,7 +710,7 @@ struct Window {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index 3edd483c..9ac82bf9 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_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="398px" preserveAspectRatio="none" style="width:1289px;height:398px;" version="1.1" viewBox="0 0 1289 398" width="1289px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fchh7la4w7vor" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11lxz5fb8ndkr" 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"/>
@@ -9,39 +9,39 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
       <ellipse cx="401.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.3594,195.3438 L400.2031,200.4219 L402.5313,200.4219 L401.3594,195.3438 Z M399.875,193.1094 L402.8594,193.1094 L406.2188,205.5 L403.7656,205.5 L403,202.4375 L399.7188,202.4375 L398.9688,205.5 L396.5313,205.5 L399.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="421.75" y="204.1543">Shape</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="222"/>
       <ellipse cx="321.5" cy="227" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="330.5" y="230.2104">~Shape() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="311.5" x2="539.5" y1="236.8047" y2="236.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="242.8047"/>
       <ellipse cx="321.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="251.0151">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="257.6094" y2="257.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L14" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L14" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L14" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L14" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
       <ellipse cx="779" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M781.9688,55.1406 Q781.3906,55.4375 780.75,55.5781 Q780.1094,55.7344 779.4063,55.7344 Q776.9063,55.7344 775.5781,54.0938 Q774.2656,52.4375 774.2656,49.3125 Q774.2656,46.1875 775.5781,44.5313 Q776.9063,42.875 779.4063,42.875 Q780.1094,42.875 780.75,43.0313 Q781.4063,43.1875 781.9688,43.4844 L781.9688,46.2031 Q781.3438,45.625 780.75,45.3594 Q780.1563,45.0781 779.5313,45.0781 Q778.1875,45.0781 777.5,46.1563 Q776.8125,47.2188 776.8125,49.3125 Q776.8125,51.4063 777.5,52.4844 Q778.1875,53.5469 779.5313,53.5469 Q780.1563,53.5469 780.75,53.2813 Q781.3438,53 781.9688,52.4219 L781.9688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="793" y="53.6543">Line</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
       <ellipse cx="169.05" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M172.0188,348.6406 Q171.4406,348.9375 170.8,349.0781 Q170.1594,349.2344 169.4563,349.2344 Q166.9563,349.2344 165.6281,347.5938 Q164.3156,345.9375 164.3156,342.8125 Q164.3156,339.6875 165.6281,338.0313 Q166.9563,336.375 169.4563,336.375 Q170.1594,336.375 170.8,336.5313 Q171.4563,336.6875 172.0188,336.9844 L172.0188,339.7031 Q171.3938,339.125 170.8,338.8594 Q170.2063,338.5781 169.5813,338.5781 Q168.2375,338.5781 167.55,339.6563 Q166.8625,340.7188 166.8625,342.8125 Q166.8625,344.9063 167.55,345.9844 Q168.2375,347.0469 169.5813,347.0469 Q170.2063,347.0469 170.8,346.7813 Q171.3938,346.5 172.0188,345.9219 L172.0188,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="183.95" y="347.1543">Line</text>
@@ -49,24 +49,24 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="222" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="156" y="365"/>
       <ellipse cx="161" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="170" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L24" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L24" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L24" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L24" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
       <ellipse cx="958.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M961.4688,55.1406 Q960.8906,55.4375 960.25,55.5781 Q959.6094,55.7344 958.9063,55.7344 Q956.4063,55.7344 955.0781,54.0938 Q953.7656,52.4375 953.7656,49.3125 Q953.7656,46.1875 955.0781,44.5313 Q956.4063,42.875 958.9063,42.875 Q959.6094,42.875 960.25,43.0313 Q960.9063,43.1875 961.4688,43.4844 L961.4688,46.2031 Q960.8438,45.625 960.25,45.3594 Q959.6563,45.0781 959.0313,45.0781 Q957.6875,45.0781 957,46.1563 Q956.3125,47.2188 956.3125,49.3125 Q956.3125,51.4063 957,52.4844 Q957.6875,53.5469 959.0313,53.5469 Q959.6563,53.5469 960.25,53.2813 Q960.8438,53 961.4688,52.4219 L961.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="972.5" y="53.6543">Text</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
       <ellipse cx="610.6" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.5688,348.6406 Q612.9906,348.9375 612.35,349.0781 Q611.7094,349.2344 611.0063,349.2344 Q608.5063,349.2344 607.1781,347.5938 Q605.8656,345.9375 605.8656,342.8125 Q605.8656,339.6875 607.1781,338.0313 Q608.5063,336.375 611.0063,336.375 Q611.7094,336.375 612.35,336.5313 Q613.0063,336.6875 613.5688,336.9844 L613.5688,339.7031 Q612.9438,339.125 612.35,338.8594 Q611.7563,338.5781 611.1313,338.5781 Q609.7875,338.5781 609.1,339.6563 Q608.4125,340.7188 608.4125,342.8125 Q608.4125,344.9063 609.1,345.9844 Q609.7875,347.0469 611.1313,347.0469 Q611.7563,347.0469 612.35,346.7813 Q612.9438,346.5 613.5688,345.9219 L613.5688,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="625.4" y="347.1543">Text</text>
@@ -74,31 +74,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="664" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598" y="365"/>
       <ellipse cx="603" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="612" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
       <ellipse cx="1096" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1096.1094,38.3438 L1094.9531,43.4219 L1097.2813,43.4219 L1096.1094,38.3438 Z M1094.625,36.1094 L1097.6094,36.1094 L1100.9688,48.5 L1098.5156,48.5 L1097.75,45.4375 L1094.4688,45.4375 L1093.7188,48.5 L1091.2813,48.5 L1094.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1110" y="47.1543">ShapeDecorator</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="59" y2="59"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1087" y="65"/>
       <ellipse cx="1092" cy="70" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1101" y="73.2104">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="79.8047" y2="79.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
       <ellipse cx="1052.3" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1055.2688,216.1406 Q1054.6906,216.4375 1054.05,216.5781 Q1053.4094,216.7344 1052.7063,216.7344 Q1050.2063,216.7344 1048.8781,215.0938 Q1047.5656,213.4375 1047.5656,210.3125 Q1047.5656,207.1875 1048.8781,205.5313 Q1050.2063,203.875 1052.7063,203.875 Q1053.4094,203.875 1054.05,204.0313 Q1054.7063,204.1875 1055.2688,204.4844 L1055.2688,207.2031 Q1054.6438,206.625 1054.05,206.3594 Q1053.4563,206.0781 1052.8313,206.0781 Q1051.4875,206.0781 1050.8,207.1563 Q1050.1125,208.2188 1050.1125,210.3125 Q1050.1125,212.4063 1050.8,213.4844 Q1051.4875,214.5469 1052.8313,214.5469 Q1053.4563,214.5469 1054.05,214.2813 Q1054.6438,214 1055.2688,213.4219 L1055.2688,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1069.7" y="214.6543">Color</text>
@@ -106,16 +106,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1126" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1028" y="232.5"/>
       <ellipse cx="1033" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1042" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
       <ellipse cx="1191.35" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1194.3188,216.1406 Q1193.7406,216.4375 1193.1,216.5781 Q1192.4594,216.7344 1191.7563,216.7344 Q1189.2563,216.7344 1187.9281,215.0938 Q1186.6156,213.4375 1186.6156,210.3125 Q1186.6156,207.1875 1187.9281,205.5313 Q1189.2563,203.875 1191.7563,203.875 Q1192.4594,203.875 1193.1,204.0313 Q1193.7563,204.1875 1194.3188,204.4844 L1194.3188,207.2031 Q1193.6938,206.625 1193.1,206.3594 Q1192.5063,206.0781 1191.8813,206.0781 Q1190.5375,206.0781 1189.85,207.1563 Q1189.1625,208.2188 1189.1625,210.3125 Q1189.1625,212.4063 1189.85,213.4844 Q1190.5375,214.5469 1191.8813,214.5469 Q1192.5063,214.5469 1193.1,214.2813 Q1193.6938,214 1194.3188,213.4219 L1194.3188,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1207.65" y="214.6543">Weight</text>
@@ -123,16 +123,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1270" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1172" y="232.5"/>
       <ellipse cx="1177" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1186" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
       <ellipse cx="149" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M151.9688,222.6406 Q151.3906,222.9375 150.75,223.0781 Q150.1094,223.2344 149.4063,223.2344 Q146.9063,223.2344 145.5781,221.5938 Q144.2656,219.9375 144.2656,216.8125 Q144.2656,213.6875 145.5781,212.0313 Q146.9063,210.375 149.4063,210.375 Q150.1094,210.375 150.75,210.5313 Q151.4063,210.6875 151.9688,210.9844 L151.9688,213.7031 Q151.3438,213.125 150.75,212.8594 Q150.1563,212.5781 149.5313,212.5781 Q148.1875,212.5781 147.5,213.6563 Q146.8125,214.7188 146.8125,216.8125 Q146.8125,218.9063 147.5,219.9844 Q148.1875,221.0469 149.5313,221.0469 Q150.1563,221.0469 150.75,220.7813 Q151.3438,220.5 151.9688,219.9219 L151.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="221.1543">Line</text>
@@ -141,8 +141,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
       <ellipse cx="21" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,222.6406 Q23.3906,222.9375 22.75,223.0781 Q22.1094,223.2344 21.4063,223.2344 Q18.9063,223.2344 17.5781,221.5938 Q16.2656,219.9375 16.2656,216.8125 Q16.2656,213.6875 17.5781,212.0313 Q18.9063,210.375 21.4063,210.375 Q22.1094,210.375 22.75,210.5313 Q23.4063,210.6875 23.9688,210.9844 L23.9688,213.7031 Q23.3438,213.125 22.75,212.8594 Q22.1563,212.5781 21.5313,212.5781 Q20.1875,212.5781 19.5,213.6563 Q18.8125,214.7188 18.8125,216.8125 Q18.8125,218.9063 19.5,219.9844 Q20.1875,221.0469 21.5313,221.0469 Q22.1563,221.0469 22.75,220.7813 Q23.3438,220.5 23.9688,219.9219 L23.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="221.1543">Line</text>
@@ -151,8 +151,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
       <ellipse cx="590.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M593.4688,222.6406 Q592.8906,222.9375 592.25,223.0781 Q591.6094,223.2344 590.9063,223.2344 Q588.4063,223.2344 587.0781,221.5938 Q585.7656,219.9375 585.7656,216.8125 Q585.7656,213.6875 587.0781,212.0313 Q588.4063,210.375 590.9063,210.375 Q591.6094,210.375 592.25,210.5313 Q592.9063,210.6875 593.4688,210.9844 L593.4688,213.7031 Q592.8438,213.125 592.25,212.8594 Q591.6563,212.5781 591.0313,212.5781 Q589.6875,212.5781 589,213.6563 Q588.3125,214.7188 588.3125,216.8125 Q588.3125,218.9063 589,219.9844 Q589.6875,221.0469 591.0313,221.0469 Q591.6563,221.0469 592.25,220.7813 Q592.8438,220.5 593.4688,219.9219 L593.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="221.1543">Text</text>
@@ -161,8 +161,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
       <ellipse cx="767.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M770.4688,222.6406 Q769.8906,222.9375 769.25,223.0781 Q768.6094,223.2344 767.9063,223.2344 Q765.4063,223.2344 764.0781,221.5938 Q762.7656,219.9375 762.7656,216.8125 Q762.7656,213.6875 764.0781,212.0313 Q765.4063,210.375 767.9063,210.375 Q768.6094,210.375 769.25,210.5313 Q769.9063,210.6875 770.4688,210.9844 L770.4688,213.7031 Q769.8438,213.125 769.25,212.8594 Q768.6563,212.5781 768.0313,212.5781 Q766.6875,212.5781 766,213.6563 Q765.3125,214.7188 765.3125,216.8125 Q765.3125,218.9063 766,219.9844 Q766.6875,221.0469 768.0313,221.0469 Q768.6563,221.0469 769.25,220.7813 Q769.8438,220.5 770.4688,219.9219 L770.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="781.5" y="221.1543">Text</text>
@@ -171,40 +171,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchh7la4w7vor)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11lxz5fb8ndkr)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
       <ellipse cx="432.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.7188,29.6406 Q435.1406,29.9375 434.5,30.0781 Q433.8594,30.2344 433.1563,30.2344 Q430.6563,30.2344 429.3281,28.5938 Q428.0156,26.9375 428.0156,23.8125 Q428.0156,20.6875 429.3281,19.0313 Q430.6563,17.375 433.1563,17.375 Q433.8594,17.375 434.5,17.5313 Q435.1563,17.6875 435.7188,17.9844 L435.7188,20.7031 Q435.0938,20.125 434.5,19.8594 Q433.9063,19.5781 433.2813,19.5781 Q431.9375,19.5781 431.25,20.6563 Q430.5625,21.7188 430.5625,23.8125 Q430.5625,25.9063 431.25,26.9844 Q431.9375,28.0469 433.2813,28.0469 Q433.9063,28.0469 434.5,27.7813 Q435.0938,27.5 435.7188,26.9219 L435.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="453.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="54"/>
       <ellipse cx="377.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="386.5" y="62.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="66.8047"/>
       <ellipse cx="377.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="386.5" y="75.0151">description : Text&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="79.6094"/>
       <ellipse cx="377.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="386.5" y="87.8198">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="92.4141"/>
       <ellipse cx="377.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="386.5" y="100.6245">title : Text&lt;Color,Weight&gt;</text>
     </a>
     <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg
index dc7a0549..81baedaf 100644
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1248.546875 481" style="max-width: 1248.55px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1383.734375 481" style="max-width: 1383.73px; background-color: white;" width="1383.734375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,18 +50,18 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M67.53861091040463,344L67.05691534200385,348.1666666666667C66.57521977360308,352.3333333333333,65.61182863680155,360.6666666666667,148.5259664017341,374.36850949109976C231.44010416666666,388.07035231553294,398.2317708333333,407.14070463106583,481.6276041666667,416.6758807888323L565.0234375,426.2110569465987"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M141.296875,304.0870436461502L174.69921875,314.9058697051252C208.1015625,325.72469576410015,274.90625,347.3623478820501,407.6471354166667,367.89247740334685C540.3880208333334,388.42260692464356,739.0651041666666,407.8452138492871,838.4036458333334,417.55651731160896L937.7421875,427.26782077393074"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M301.7135416666667,131L293.9357638888889,140.33333333333334C286.15798611111114,149.66666666666666,270.6024305555556,168.33333333333334,262.82465277777777,187C255.046875,205.66666666666666,255.046875,224.33333333333334,255.046875,233.66666666666666L255.046875,243"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M385.8802083333333,131L393.6579861111111,140.33333333333334C401.43576388888886,149.66666666666666,416.9913194444444,168.33333333333334,424.76909722222223,187C432.546875,205.66666666666666,432.546875,224.33333333333334,432.546875,233.66666666666666L432.546875,243"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M628.7734375,311L628.7734375,320.6666666666667C628.7734375,330.3333333333333,628.7734375,349.6666666666667,628.7734375,363.5C628.7734375,377.3333333333333,628.7734375,385.6666666666667,628.7734375,389.8333333333333L628.7734375,394"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M815.4296875,311L815.4296875,320.6666666666667C815.4296875,330.3333333333333,815.4296875,349.6666666666667,794.9453125,366.4118114850159C774.4609375,383.1569563033651,733.4921875,397.3139126067303,713.0078125,404.39239075841283L692.5234375,411.4708689100954"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1001.4921875,311L1001.4921875,320.6666666666667C1001.4921875,330.3333333333333,1001.4921875,349.6666666666667,1001.4921875,363.5C1001.4921875,377.3333333333333,1001.4921875,385.6666666666667,1001.4921875,389.8333333333333L1001.4921875,394"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1186.9609375,311L1186.9609375,320.6666666666667C1186.9609375,330.3333333333333,1186.9609375,349.6666666666667,1166.6744791666667,366.3883038472339C1146.3880208333333,383.10994102780114,1105.8151041666667,397.21988205560234,1085.5286458333333,404.2748525695029L1065.2421875,411.32982308340354"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M796.375,123.18032122905028L768.44140625,133.8169343575419C740.5078125,144.4535474860335,684.640625,165.72677374301676,656.70703125,187.53005353817503C628.7734375,209.33333333333334,628.7734375,231.66666666666666,628.7734375,242.83333333333334L628.7734375,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M845.129804870892,153L840.1797853090767,158.66666666666666C835.2297657472614,164.33333333333334,825.3297266236308,175.66666666666666,820.3797070618153,192.5C815.4296875,209.33333333333334,815.4296875,231.66666666666666,815.4296875,242.83333333333334L815.4296875,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M971.792070129108,153L976.7420896909233,158.66666666666666C981.6921092527386,164.33333333333334,991.5921483763692,175.66666666666666,996.5421679381847,192.5C1001.4921875,209.33333333333334,1001.4921875,231.66666666666666,1001.4921875,242.83333333333334L1001.4921875,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1020.546875,123.36230644075404L1048.2825520833333,133.96858870062837C1076.0182291666667,144.5748709605027,1131.4895833333333,165.78743548025133,1159.2252604166667,187.56038440679234C1186.9609375,209.33333333333334,1186.9609375,231.66666666666666,1186.9609375,242.83333333333334L1186.9609375,254"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.13236091040463,344L134.65066534200386,348.1666666666667C134.1689697736031,352.3333333333333,133.20557863680153,360.6666666666667,227.3853414017341,374.4984953417429C321.5651041666667,388.33032401681913,510.8880208333333,407.6606480336384,605.5494791666666,417.325810042048L700.2109375,426.9909720504576"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M276.484375,321.0959361204882L304.25390625,329.0799467670735C332.0234375,337.0639574136588,387.5625,353.0319787068294,520.3033854166666,370.7779067203299C653.0442708333334,388.5238347338304,862.9869791666666,408.04766946766085,967.9583333333334,417.80958683457607L1072.9296875,427.57150420149134"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M436.9010416666667,131L429.1232638888889,140.33333333333334C421.34548611111114,149.66666666666666,405.7899305555556,168.33333333333334,398.0121527777778,187C390.234375,205.66666666666666,390.234375,224.33333333333334,390.234375,233.66666666666666L390.234375,243"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M521.0677083333334,131L528.8454861111112,140.33333333333334C536.6232638888889,149.66666666666666,552.1788194444445,168.33333333333334,559.9565972222223,187C567.734375,205.66666666666666,567.734375,224.33333333333334,567.734375,233.66666666666666L567.734375,243"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M763.9609375,311L763.9609375,320.6666666666667C763.9609375,330.3333333333333,763.9609375,349.6666666666667,763.9609375,363.5C763.9609375,377.3333333333333,763.9609375,385.6666666666667,763.9609375,389.8333333333333L763.9609375,394"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M950.6171875,311L950.6171875,320.6666666666667C950.6171875,330.3333333333333,950.6171875,349.6666666666667,930.1328125,366.4118114850159C909.6484375,383.1569563033651,868.6796875,397.3139126067303,848.1953125,404.39239075841283L827.7109375,411.4708689100954"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1136.6796875,311L1136.6796875,320.6666666666667C1136.6796875,330.3333333333333,1136.6796875,349.6666666666667,1136.6796875,363.5C1136.6796875,377.3333333333333,1136.6796875,385.6666666666667,1136.6796875,389.8333333333333L1136.6796875,394"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1322.1484375,311L1322.1484375,320.6666666666667C1322.1484375,330.3333333333333,1322.1484375,349.6666666666667,1301.8619791666667,366.3883038472339C1281.5755208333333,383.10994102780114,1241.0026041666667,397.21988205560234,1220.7161458333333,404.2748525695029L1200.4296875,411.32982308340354"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M931.5625,123.18032122905028L903.62890625,133.8169343575419C875.6953125,144.4535474860335,819.828125,165.72677374301676,791.89453125,187.53005353817503C763.9609375,209.33333333333334,763.9609375,231.66666666666666,763.9609375,242.83333333333334L763.9609375,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M980.317304870892,153L975.3672853090767,158.66666666666666C970.4172657472614,164.33333333333334,960.5172266236308,175.66666666666666,955.5672070618153,192.5C950.6171875,209.33333333333334,950.6171875,231.66666666666666,950.6171875,242.83333333333334L950.6171875,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M1106.979570129108,153L1111.9295896909232,158.66666666666666C1116.8796092527386,164.33333333333334,1126.7796483763693,175.66666666666666,1131.7296679381845,192.5C1136.6796875,209.33333333333334,1136.6796875,231.66666666666666,1136.6796875,242.83333333333334L1136.6796875,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1155.734375,123.36230644075404L1183.4700520833333,133.96858870062837C1211.2057291666667,144.5748709605027,1266.6770833333333,165.78743548025133,1294.4127604166667,187.56038440679234C1322.1484375,209.33333333333334,1322.1484375,231.66666666666666,1322.1484375,242.83333333333334L1322.1484375,254"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -100,43 +100,51 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(628.7734375, 187)" class="edgeLabel">
+        <g transform="translate(763.9609375, 187)" class="edgeLabel">
           <g transform="translate(-27.796875, -9)" class="label">
             <foreignObject height="18" width="55.59375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -147,7 +155,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(815.4296875, 187)" class="edgeLabel">
+        <g transform="translate(950.6171875, 187)" class="edgeLabel">
           <g transform="translate(-28.2421875, -9)" class="label">
             <foreignObject height="18" width="56.484375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -158,7 +166,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1001.4921875, 187)" class="edgeLabel">
+        <g transform="translate(1136.6796875, 187)" class="edgeLabel">
           <g transform="translate(-17.125, -9)" class="label">
             <foreignObject height="18" width="34.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -169,7 +177,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1186.9609375, 187)" class="edgeLabel">
+        <g transform="translate(1322.1484375, 187)" class="edgeLabel">
           <g transform="translate(-43.359375, -9)" class="label">
             <foreignObject height="18" width="86.71875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -182,11 +190,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(74.6484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L8">
+        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L8">
           <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
-            <rect height="123" width="133.296875" y="-61.5" x="-66.6484375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="66.6484375" x1="-66.6484375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="66.6484375" x1="-66.6484375" class="divider"/>
+            <rect height="123" width="268.484375" y="-61.5" x="-134.2421875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -198,12 +206,12 @@
                   <span class="nodeLabel">Shape</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -59.1484375, 14)" height="18" width="118.296875">
+              <foreignObject transform="translate( -126.7421875, 14)" height="18" width="253.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Shape() : void</span>
+                  <span class="nodeLabel">+~Shape() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -59.1484375, 36)" height="18" width="112.5">
+              <foreignObject transform="translate( -126.7421875, 36)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
                   <span style="font-style:italic;" class="nodeLabel">+display() : void</span>
                 </div>
@@ -211,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(103.8359375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L14">
+        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L14">
           <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
             <rect height="57" width="47.890625" y="-28.5" x="-23.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -230,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.7734375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -254,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(201.140625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L24">
+        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L24">
           <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
             <rect height="57" width="46.71875" y="-28.5" x="-23.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -273,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1001.4921875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -297,7 +305,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(343.796875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L34">
+        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L34">
           <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
             <rect height="101" width="138.59375" y="-50.5" x="-69.296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -321,7 +329,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.046875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L38">
+        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L38">
           <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -345,7 +353,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(432.546875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L43">
+        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L43">
           <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -369,7 +377,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.7734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
             <rect height="57" width="164.953125" y="-28.5" x="-82.4765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -388,7 +396,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(815.4296875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L15">
+        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
             <rect height="57" width="108.359375" y="-28.5" x="-54.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -407,7 +415,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1001.4921875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
             <rect height="57" width="163.765625" y="-28.5" x="-81.8828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -426,7 +434,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1186.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
             <rect height="57" width="107.171875" y="-28.5" x="-53.5859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -445,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(908.4609375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00027/t00027.cc#L48">
+        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00027/t00027.cc#L48">
           <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
             <rect height="145" width="224.171875" y="-72.5" x="-112.0859375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md
index 79959c91..c6a1545b 100644
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -461,7 +461,7 @@ class R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index d276803a..76ccc984 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_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="410px" preserveAspectRatio="none" style="width:1066px;height:410px;" version="1.1" viewBox="0 0 1066 410" width="1066px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwans96kg9hp0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1b5xt914nwek8" 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"/>
@@ -9,54 +9,54 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
       <ellipse cx="78.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.4688,248.1406 Q80.8906,248.4375 80.25,248.5781 Q79.6094,248.7344 78.9063,248.7344 Q76.4063,248.7344 75.0781,247.0938 Q73.7656,245.4375 73.7656,242.3125 Q73.7656,239.1875 75.0781,237.5313 Q76.4063,235.875 78.9063,235.875 Q79.6094,235.875 80.25,236.0313 Q80.9063,236.1875 81.4688,236.4844 L81.4688,239.2031 Q80.8438,238.625 80.25,238.3594 Q79.6563,238.0781 79.0313,238.0781 Q77.6875,238.0781 77,239.1563 Q76.3125,240.2188 76.3125,242.3125 Q76.3125,244.4063 77,245.4844 Q77.6875,246.5469 79.0313,246.5469 Q79.6563,246.5469 80.25,246.2813 Q80.8438,246 81.4688,245.4219 L81.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="92.5" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M99,64.5 L99,74.5 L109,74.5 L99,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="12" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
       <ellipse cx="722.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M725.4688,248.1406 Q724.8906,248.4375 724.25,248.5781 Q723.6094,248.7344 722.9063,248.7344 Q720.4063,248.7344 719.0781,247.0938 Q717.7656,245.4375 717.7656,242.3125 Q717.7656,239.1875 719.0781,237.5313 Q720.4063,235.875 722.9063,235.875 Q723.6094,235.875 724.25,236.0313 Q724.9063,236.1875 725.4688,236.4844 L725.4688,239.2031 Q724.8438,238.625 724.25,238.3594 Q723.6563,238.0781 723.0313,238.0781 Q721.6875,238.0781 721,239.1563 Q720.3125,240.2188 720.3125,242.3125 Q720.3125,244.4063 721,245.4844 Q721.6875,246.5469 723.0313,246.5469 Q723.6563,246.5469 724.25,246.2813 Q724.8438,246 725.4688,245.4219 L725.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="736.5" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M662,238 L662,248 L672,248 L662,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="575" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
       <ellipse cx="284.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M287.4688,248.1406 Q286.8906,248.4375 286.25,248.5781 Q285.6094,248.7344 284.9063,248.7344 Q282.4063,248.7344 281.0781,247.0938 Q279.7656,245.4375 279.7656,242.3125 Q279.7656,239.1875 281.0781,237.5313 Q282.4063,235.875 284.9063,235.875 Q285.6094,235.875 286.25,236.0313 Q286.9063,236.1875 287.4688,236.4844 L287.4688,239.2031 Q286.8438,238.625 286.25,238.3594 Q285.6563,238.0781 285.0313,238.0781 Q283.6875,238.0781 283,239.1563 Q282.3125,240.2188 282.3125,242.3125 Q282.3125,244.4063 283,245.4844 Q283.6875,246.5469 285.0313,246.5469 Q285.6563,246.5469 286.25,246.2813 Q286.8438,246 287.4688,245.4219 L287.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.5" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M275,357 L275,367 L285,367 L275,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="188" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
       <ellipse cx="887" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M889.9688,248.1406 Q889.3906,248.4375 888.75,248.5781 Q888.1094,248.7344 887.4063,248.7344 Q884.9063,248.7344 883.5781,247.0938 Q882.2656,245.4375 882.2656,242.3125 Q882.2656,239.1875 883.5781,237.5313 Q884.9063,235.875 887.4063,235.875 Q888.1094,235.875 888.75,236.0313 Q889.4063,236.1875 889.9688,236.4844 L889.9688,239.2031 Q889.3438,238.625 888.75,238.3594 Q888.1563,238.0781 887.5313,238.0781 Q886.1875,238.0781 885.5,239.1563 Q884.8125,240.2188 884.8125,242.3125 Q884.8125,244.4063 885.5,245.4844 Q886.1875,246.5469 887.5313,246.5469 Q888.1563,246.5469 888.75,246.2813 Q889.3438,246 889.9688,245.4219 L889.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="901" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M826.5,223 L826.5,233 L836.5,233 L826.5,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="788.5" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="788.5" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="788.5" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
       <ellipse cx="548.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4188,360.6406 Q550.8406,360.9375 550.2,361.0781 Q549.5594,361.2344 548.8563,361.2344 Q546.3563,361.2344 545.0281,359.5938 Q543.7156,357.9375 543.7156,354.8125 Q543.7156,351.6875 545.0281,350.0313 Q546.3563,348.375 548.8563,348.375 Q549.5594,348.375 550.2,348.5313 Q550.8563,348.6875 551.4188,348.9844 L551.4188,351.7031 Q550.7938,351.125 550.2,350.8594 Q549.6063,350.5781 548.9813,350.5781 Q547.6375,350.5781 546.95,351.6563 Q546.2625,352.7188 546.2625,354.8125 Q546.2625,356.9063 546.95,357.9844 Q547.6375,359.0469 548.9813,359.0469 Q549.6063,359.0469 550.2,358.7813 Q550.7938,358.5 551.4188,357.9219 L551.4188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="565.55" y="359.1543">E</text>
@@ -65,26 +65,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="371" y2="371"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="379" y2="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="525.5" y="385"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="527.5" y="387"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="539.5" y="393.2104">param : T</text>
     </a>
-    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M474.5,357 L474.5,367 L484.5,367 L474.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="326.5" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
       <ellipse cx="412" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M414.9688,248.1406 Q414.3906,248.4375 413.75,248.5781 Q413.1094,248.7344 412.4063,248.7344 Q409.9063,248.7344 408.5781,247.0938 Q407.2656,245.4375 407.2656,242.3125 Q407.2656,239.1875 408.5781,237.5313 Q409.9063,235.875 412.4063,235.875 Q413.1094,235.875 413.75,236.0313 Q414.4063,236.1875 414.9688,236.4844 L414.9688,239.2031 Q414.3438,238.625 413.75,238.3594 Q413.1563,238.0781 412.5313,238.0781 Q411.1875,238.0781 410.5,239.1563 Q409.8125,240.2188 409.8125,242.3125 Q409.8125,244.4063 410.5,245.4844 Q411.1875,246.5469 412.5313,246.5469 Q413.1563,246.5469 413.75,246.2813 Q414.3438,246 414.9688,245.4219 L414.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="426" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
       <ellipse cx="996.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1000.9594,56 L993.2406,56 L993.2406,43.6094 L1000.9594,43.6094 L1000.9594,45.7656 L995.6938,45.7656 L995.6938,48.4375 L1000.4594,48.4375 L1000.4594,50.5938 L995.6938,50.5938 L995.6938,53.8438 L1000.9594,53.8438 L1000.9594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1011.15" y="54.1543">F</text>
@@ -94,11 +94,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="986.5" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1044.5,238 L1044.5,248 L1054.5,248 L1044.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="954.5" y="255.0669">F enum note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
       <ellipse cx="488.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M491.4688,248.1406 Q490.8906,248.4375 490.25,248.5781 Q489.6094,248.7344 488.9063,248.7344 Q486.4063,248.7344 485.0781,247.0938 Q483.7656,245.4375 483.7656,242.3125 Q483.7656,239.1875 485.0781,237.5313 Q486.4063,235.875 488.9063,235.875 Q489.6094,235.875 490.25,236.0313 Q490.9063,236.1875 491.4688,236.4844 L491.4688,239.2031 Q490.8438,238.625 490.25,238.3594 Q489.6563,238.0781 489.0313,238.0781 Q487.6875,238.0781 487,239.1563 Q486.3125,240.2188 486.3125,242.3125 Q486.3125,244.4063 487,245.4844 Q487.6875,246.5469 489.0313,246.5469 Q489.6563,246.5469 490.25,246.2813 Q490.8438,246 491.4688,245.4219 L491.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.5" y="246.6543">E</text>
@@ -107,70 +107,70 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwans96kg9hp0)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5xt914nwek8)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
       <ellipse cx="495.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.2188,29.6406 Q497.6406,29.9375 497,30.0781 Q496.3594,30.2344 495.6563,30.2344 Q493.1563,30.2344 491.8281,28.5938 Q490.5156,26.9375 490.5156,23.8125 Q490.5156,20.6875 491.8281,19.0313 Q493.1563,17.375 495.6563,17.375 Q496.3594,17.375 497,17.5313 Q497.6563,17.6875 498.2188,17.9844 L498.2188,20.7031 Q497.5938,20.125 497,19.8594 Q496.4063,19.5781 495.7813,19.5781 Q494.4375,19.5781 493.75,20.6563 Q493.0625,21.7188 493.0625,23.8125 Q493.0625,25.9063 493.75,26.9844 Q494.4375,28.0469 495.7813,28.0469 Q496.4063,28.0469 497,27.7813 Q497.5938,27.5 498.2188,26.9219 L498.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="54.2104">R(C &amp; c) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="397.5" y="75.0151">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="397.5" y="87.8198">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="397.5" y="100.6245">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="397.5" y="113.4292">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="118.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="120.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="397.5" y="126.2339">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="130.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="397.5" y="139.0386">ggg : G **</text>
     </a>
-    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M756.5,64.5 L756.5,74.5 L766.5,74.5 L756.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="670.5" y="81.5669">R class note.</text>
-    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M332.5,42 L332.5,52 L342.5,52 L332.5,42 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="150.5" y="59.0669">R contains an instance of A.</text>
-    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#fwans96kg9hp0)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#f1b5xt914nwek8)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M253.5,77.1328 L253.5,87.1328 L263.5,87.1328 L253.5,77.1328 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="150.5" y="94.1997">Reference to C.</text>
     <path d="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg
index d5b762aa..6090b9b0 100644
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1388.75 564" style="max-width: 1388.75px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1386.984375 564" style="max-width: 1386.98px; background-color: white;" width="1386.984375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,33 +50,35 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1348.796875,427L1348.796875,431.1666666666667C1348.796875,435.3333333333333,1348.796875,443.6666666666667,1340.5169270833333,453.5190398957554C1332.2369791666667,463.3714131248441,1315.6770833333333,474.7428262496881,1307.3971354166667,480.4285328121102L1299.1171875,486.11423937453213"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M651.328125,238.28613472858078L594.849609375,254.571778940484C538.37109375,270.8574231523872,425.4140625,303.4287115761936,358.1354166666667,328.3592146271249C290.8567708333333,353.2897176780563,269.2565104166667,370.5794353561125,258.4563802083333,379.22429419514066L247.65625,387.8691530341688"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M651.328125,258.2871845077485L620.9505208333334,271.23932042312373C590.5729166666666,284.191456338499,529.8177083333334,310.0957281692495,491.5677083333333,331.17840457864315C453.3177083333333,352.26108098803684,437.5729166666667,368.5221619760737,429.7005208333333,376.65270247009204L421.828125,384.7832429641105"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M730.656235999104,302L727.1334518742533,307.6666666666667C723.6106677494026,313.3333333333333,716.5650994997013,324.6666666666667,697.4231747498507,339.45699621530184C678.28125,354.247325763937,647.04296875,372.4946515278741,631.423828125,381.61831440984264L615.8046875,390.74197729181117"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M924.7582745295699,302L931.6611923163082,307.6666666666667C938.5641101030466,313.3333333333333,952.3699456765233,324.6666666666667,957.6401551299282,336C962.9103645833334,347.3333333333333,959.6449479166668,358.6666666666667,958.0122395833333,364.3333333333333L956.37953125,370"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M941.15625,233.0855401756048L1009.0963541666666,250.2379501463373C1077.0364583333333,267.39036011706986,1212.9166666666667,301.69518005853496,1280.8567708333333,324.51425669593414C1348.796875,347.3333333333333,1348.796875,358.6666666666667,1348.796875,364.3333333333333L1348.796875,370"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M941.15625,282.7241086304565L956.0794270833334,291.60342385871377C971.0026041666666,300.482739086971,1000.8489583333334,318.2413695434855,1015.7721354166666,332.7873514384094C1030.6953125,347.3333333333333,1030.6953125,358.6666666666667,1030.6953125,364.3333333333333L1030.6953125,370"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote8" d="M234.375,213L234.375,233.5C234.375,254,234.375,295,234.375,321.1666666666667C234.375,347.3333333333333,234.375,358.6666666666667,234.375,364.3333333333333L234.375,370"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M390.5390625,213L390.5390625,233.5C390.5390625,254,390.5390625,295,392.1717708333333,321.1666666666667C393.8044791666666,347.3333333333333,397.0698958333333,358.6666666666667,398.7026041666666,364.3333333333333L400.3353125,370"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M547.5859375,213L547.5859375,233.5C547.5859375,254,547.5859375,295,554.5286458333334,323.39841676147137C561.4713541666666,351.79683352294273,575.3567708333334,367.59366704588547,582.2994791666666,375.4920838073569L589.2421875,383.3905005688282"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M995.4352738575269,231L984.5560875896058,248.5C973.6769013216846,266,951.9185287858423,301,942.6720508512545,324.1666666666667C933.4255729166666,347.3333333333333,936.6909895833332,358.6666666666667,938.3236979166667,364.3333333333333L939.95640625,370"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote12" d="M1180.6328125,415L1180.6328125,421.1666666666667C1180.6328125,427.3333333333333,1180.6328125,439.6666666666667,1185.6302083333333,450.1754192099909C1190.6276041666667,460.68417175331507,1200.6223958333333,469.3683435066302,1205.6197916666667,473.7104293832877L1210.6171875,478.05251525994527"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote13" d="M69.7578125,41L69.7578125,45.166666666666664C69.7578125,49.333333333333336,69.7578125,57.666666666666664,69.7578125,71.5C69.7578125,85.33333333333333,69.7578125,104.66666666666667,69.7578125,114.33333333333333L69.7578125,124"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote14" d="M1006.65625,41L1006.65625,45.166666666666664C1006.65625,49.333333333333336,1006.65625,57.666666666666664,995.7395833333334,68.60391217713091C984.8229166666666,79.54115768759515,962.9895833333334,93.08231537519028,952.0729166666666,99.85289421898786L941.15625,106.62347306278544"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote15" d="M538.65625,41L538.65625,45.166666666666664C538.65625,49.333333333333336,538.65625,57.666666666666664,557.4348958333334,71.34710300971561C576.2135416666666,85.02753935276455,613.7708333333334,104.05507870552908,632.5494791666666,113.56884838191137L651.328125,123.08261805829365"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1347.03125,427L1347.03125,431.1666666666667C1347.03125,435.3333333333333,1347.03125,443.6666666666667,1338.7513020833333,453.5190398957554C1330.4713541666667,463.3714131248441,1313.9114583333333,474.7428262496881,1305.6315104166667,480.4285328121102L1297.3515625,486.11423937453213"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M649.5625,238.28613472858078L593.083984375,254.571778940484C536.60546875,270.8574231523872,423.6484375,303.4287115761936,356.3697916666667,328.3592146271249C289.0911458333333,353.2897176780563,267.4908854166667,370.5794353561125,256.6907552083333,379.22429419514066L245.890625,387.8691530341688"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M649.5625,258.2871845077485L619.1848958333334,271.23932042312373C588.8072916666666,284.191456338499,528.0520833333334,310.0957281692495,489.8020833333333,331.17840457864315C451.5520833333333,352.26108098803684,435.8072916666667,368.5221619760737,427.9348958333333,376.65270247009204L420.0625,384.7832429641105"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.890610999104,302L725.3678268742533,307.6666666666667C721.8450427494026,313.3333333333333,714.7994744997013,324.6666666666667,695.6575497498507,339.45699621530184C676.515625,354.247325763937,645.27734375,372.4946515278741,629.658203125,381.61831440984264L614.0390625,390.74197729181117"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M922.9926495295699,302L929.8955673163082,307.6666666666667C936.7984851030466,313.3333333333333,950.6043206765233,324.6666666666667,955.8745301299282,336C961.1447395833334,347.3333333333333,957.8793229166668,358.6666666666667,956.2466145833333,364.3333333333333L954.61390625,370"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M939.390625,233.0855401756048L1007.3307291666666,250.2379501463373C1075.2708333333333,267.39036011706986,1211.1510416666667,301.69518005853496,1279.0911458333333,324.51425669593414C1347.03125,347.3333333333333,1347.03125,358.6666666666667,1347.03125,364.3333333333333L1347.03125,370"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M939.390625,282.7241086304565L954.3138020833334,291.60342385871377C969.2369791666666,300.482739086971,999.0833333333334,318.2413695434855,1014.0065104166666,332.7873514384094C1028.9296875,347.3333333333333,1028.9296875,358.6666666666667,1028.9296875,364.3333333333333L1028.9296875,370"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote8" d="M232.609375,213L232.609375,233.5C232.609375,254,232.609375,295,232.609375,321.1666666666667C232.609375,347.3333333333333,232.609375,358.6666666666667,232.609375,364.3333333333333L232.609375,370"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M388.7734375,213L388.7734375,233.5C388.7734375,254,388.7734375,295,390.4061458333333,321.1666666666667C392.0388541666666,347.3333333333333,395.3042708333333,358.6666666666667,396.9369791666666,364.3333333333333L398.5696875,370"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M545.8203125,213L545.8203125,233.5C545.8203125,254,545.8203125,295,552.7630208333334,323.39841676147137C559.7057291666666,351.79683352294273,573.5911458333334,367.59366704588547,580.5338541666666,375.4920838073569L587.4765625,383.3905005688282"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M993.6696488575269,231L982.7904625896058,248.5C971.9112763216846,266,950.1529037858423,301,940.9064258512545,324.1666666666667C931.6599479166666,347.3333333333333,934.9253645833332,358.6666666666667,936.5580729166667,364.3333333333333L938.19078125,370"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote12" d="M1178.8671875,415L1178.8671875,421.1666666666667C1178.8671875,427.3333333333333,1178.8671875,439.6666666666667,1183.8645833333333,450.1754192099909C1188.8619791666667,460.68417175331507,1198.8567708333333,469.3683435066302,1203.8541666666667,473.7104293832877L1208.8515625,478.05251525994527"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote13" d="M68.875,41L68.875,45.166666666666664C68.875,49.333333333333336,68.875,57.666666666666664,68.875,71.5C68.875,85.33333333333333,68.875,104.66666666666667,68.875,114.33333333333333L68.875,124"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote14" d="M1004.890625,41L1004.890625,45.166666666666664C1004.890625,49.333333333333336,1004.890625,57.666666666666664,993.9739583333334,68.60391217713091C983.0572916666666,79.54115768759515,961.2239583333334,93.08231537519028,950.3072916666666,99.85289421898786L939.390625,106.62347306278544"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote15" d="M537.33203125,41L537.33203125,45.166666666666664C537.33203125,49.333333333333336,537.33203125,57.666666666666664,556.037109375,71.3260986799131C574.7421875,84.98553069315955,612.15234375,103.97106138631909,630.857421875,113.46382673289888L649.5625,122.95659207947865"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(312.45703125, 336)" class="edgeLabel">
+        <g transform="translate(310.69140625, 336)" class="edgeLabel">
           <g transform="translate(-16.015625, -9)" class="label">
             <foreignObject height="18" width="32.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -87,7 +89,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(469.0625, 336)" class="edgeLabel">
+        <g transform="translate(467.296875, 336)" class="edgeLabel">
           <g transform="translate(-16.015625, -9)" class="label">
             <foreignObject height="18" width="32.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -98,7 +100,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(709.51953125, 336)" class="edgeLabel">
+        <g transform="translate(707.75390625, 336)" class="edgeLabel">
           <g transform="translate(-14.6640625, -9)" class="label">
             <foreignObject height="18" width="29.328125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -109,7 +111,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(966.17578125, 336)" class="edgeLabel">
+        <g transform="translate(964.41015625, 336)" class="edgeLabel">
           <g transform="translate(-16.015625, -9)" class="label">
             <foreignObject height="18" width="32.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -120,7 +122,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1348.796875, 336)" class="edgeLabel">
+        <g transform="translate(1347.03125, 336)" class="edgeLabel">
           <g transform="translate(-16.015625, -9)" class="label">
             <foreignObject height="18" width="32.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -131,7 +133,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1030.6953125, 336)" class="edgeLabel">
+        <g transform="translate(1028.9296875, 336)" class="edgeLabel">
           <g transform="translate(-16.015625, -9)" class="label">
             <foreignObject height="18" width="32.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -216,7 +218,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(234.375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L8">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L8">
           <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -235,7 +237,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(408.546875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L11">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L11">
           <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -254,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(602.5234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L16">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L16">
           <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -273,7 +275,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.16796875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L22">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L22">
           <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -292,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1254.8671875, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -316,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1030.6953125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L30">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L30">
           <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -335,15 +337,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.7578125, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L33">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L33">
           <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -4.890625, -43)" height="18" width="9.78125" class="classTitle">
@@ -351,17 +353,17 @@
                   <span class="nodeLabel">F</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="26.703125">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="26.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">one</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="24.90625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="24.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">two</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="36.46875">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="36.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">three</span>
                 </div>
@@ -369,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.796875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -388,7 +390,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(796.2421875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00028/t00028.cc#L36">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00028/t00028.cc#L36">
           <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
             <rect height="211" width="289.828125" y="-105.5" x="-144.9140625" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
@@ -442,7 +444,7 @@
             </g>
           </g>
         </a>
-        <g transform="translate(234.375, 196.5)" id="note0" class="node undefined">
+        <g transform="translate(232.609375, 196.5)" id="note0" class="node undefined">
           <rect height="33" width="105.71875" y="-16.5" x="-52.859375" ry="0" rx="0"/>
           <g transform="translate(-45.359375, -9)" style="" class="label">
             <rect/>
@@ -453,7 +455,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(390.5390625, 196.5)" id="note1" class="node undefined">
+        <g transform="translate(388.7734375, 196.5)" id="note1" class="node undefined">
           <rect height="33" width="106.609375" y="-16.5" x="-53.3046875" ry="0" rx="0"/>
           <g transform="translate(-45.8046875, -9)" style="" class="label">
             <rect/>
@@ -464,7 +466,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(547.5859375, 196.5)" id="note2" class="node undefined">
+        <g transform="translate(545.8203125, 196.5)" id="note2" class="node undefined">
           <rect height="33" width="107.484375" y="-16.5" x="-53.7421875" ry="0" rx="0"/>
           <g transform="translate(-46.2421875, -9)" style="" class="label">
             <rect/>
@@ -475,7 +477,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1016.8828125, 196.5)" id="note3" class="node undefined">
+        <g transform="translate(1015.1171875, 196.5)" id="note3" class="node undefined">
           <rect height="69" width="51.453125" y="-34.5" x="-25.7265625" ry="0" rx="0"/>
           <g transform="translate(-18.2265625, -27)" style="" class="label">
             <rect/>
@@ -486,7 +488,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1180.6328125, 398.5)" id="note4" class="node undefined">
+        <g transform="translate(1178.8671875, 398.5)" id="note4" class="node undefined">
           <rect height="33" width="172.421875" y="-16.5" x="-86.2109375" ry="0" rx="0"/>
           <g transform="translate(-78.7109375, -9)" style="" class="label">
             <rect/>
@@ -497,7 +499,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(69.7578125, 24.5)" id="note5" class="node undefined">
+        <g transform="translate(68.875, 24.5)" id="note5" class="node undefined">
           <rect height="33" width="109.28125" y="-16.5" x="-54.640625" ry="0" rx="0"/>
           <g transform="translate(-47.140625, -9)" style="" class="label">
             <rect/>
@@ -508,7 +510,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1006.65625, 24.5)" id="note6" class="node undefined">
+        <g transform="translate(1004.890625, 24.5)" id="note6" class="node undefined">
           <rect height="33" width="107.484375" y="-16.5" x="-53.7421875" ry="0" rx="0"/>
           <g transform="translate(-46.2421875, -9)" style="" class="label">
             <rect/>
@@ -519,7 +521,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(538.65625, 24.5)" id="note7" class="node undefined">
+        <g transform="translate(537.33203125, 24.5)" id="note7" class="node undefined">
           <rect height="33" width="213.34375" y="-16.5" x="-106.671875" ry="0" rx="0"/>
           <g transform="translate(-99.171875, -9)" style="" class="label">
             <rect/>
diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md
index f65247bf..3d463517 100644
--- a/docs/test_cases/t00029.md
+++ b/docs/test_cases/t00029.md
@@ -312,7 +312,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 2ab0a3da..e394baeb 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_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="230px" preserveAspectRatio="none" style="width:464px;height:230px;" version="1.1" viewBox="0 0 464 230" width="464px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvvbo9f210atk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwr477b1ljvk8" 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"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
       <ellipse cx="25.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.4688,48.6406 Q27.8906,48.9375 27.25,49.0781 Q26.6094,49.2344 25.9063,49.2344 Q23.4063,49.2344 22.0781,47.5938 Q20.7656,45.9375 20.7656,42.8125 Q20.7656,39.6875 22.0781,38.0313 Q23.4063,36.375 25.9063,36.375 Q26.6094,36.375 27.25,36.5313 Q27.9063,36.6875 28.4688,36.9844 L28.4688,39.7031 Q27.8438,39.125 27.25,38.8594 Q26.6563,38.5781 26.0313,38.5781 Q24.6875,38.5781 24,39.6563 Q23.3125,40.7188 23.3125,42.8125 Q23.3125,44.9063 24,45.9844 Q24.6875,47.0469 26.0313,47.0469 Q26.6563,47.0469 27.25,46.7813 Q27.8438,46.5 28.4688,45.9219 L28.4688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.5" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
       <ellipse cx="114.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.4188,42.1406 Q116.8406,42.4375 116.2,42.5781 Q115.5594,42.7344 114.8563,42.7344 Q112.3563,42.7344 111.0281,41.0938 Q109.7156,39.4375 109.7156,36.3125 Q109.7156,33.1875 111.0281,31.5313 Q112.3563,29.875 114.8563,29.875 Q115.5594,29.875 116.2,30.0313 Q116.8563,30.1875 117.4188,30.4844 L117.4188,33.2031 Q116.7938,32.625 116.2,32.3594 Q115.6063,32.0781 114.9813,32.0781 Q113.6375,32.0781 112.95,33.1563 Q112.2625,34.2188 112.2625,36.3125 Q112.2625,38.4063 112.95,39.4844 Q113.6375,40.5469 114.9813,40.5469 Q115.6063,40.5469 116.2,40.2813 Q116.7938,40 117.4188,39.4219 L117.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.55" y="40.6543">C</text>
@@ -27,15 +27,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="91.5" y="66.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
       <ellipse cx="218.4" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.5094,30 L214.7906,30 L214.7906,17.6094 L222.5094,17.6094 L222.5094,19.7656 L217.2438,19.7656 L217.2438,22.4375 L222.0094,22.4375 L222.0094,24.5938 L217.2438,24.5938 L217.2438,27.8438 L222.5094,27.8438 L222.5094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="232.6" y="28.1543">E</text>
@@ -45,65 +45,65 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="208.5" y="79.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
       <ellipse cx="315" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M317.9688,192.6406 Q317.3906,192.9375 316.75,193.0781 Q316.1094,193.2344 315.4063,193.2344 Q312.9063,193.2344 311.5781,191.5938 Q310.2656,189.9375 310.2656,186.8125 Q310.2656,183.6875 311.5781,182.0313 Q312.9063,180.375 315.4063,180.375 Q316.1094,180.375 316.75,180.5313 Q317.4063,180.6875 317.9688,180.9844 L317.9688,183.7031 Q317.3438,183.125 316.75,182.8594 Q316.1563,182.5781 315.5313,182.5781 Q314.1875,182.5781 313.5,183.6563 Q312.8125,184.7188 312.8125,186.8125 Q312.8125,188.9063 313.5,189.9844 Q314.1875,191.0469 315.5313,191.0469 Q316.1563,191.0469 316.75,190.7813 Q317.3438,190.5 317.9688,189.9219 L317.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="329" y="191.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="191.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
       <ellipse cx="105" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,192.6406 Q107.3906,192.9375 106.75,193.0781 Q106.1094,193.2344 105.4063,193.2344 Q102.9063,193.2344 101.5781,191.5938 Q100.2656,189.9375 100.2656,186.8125 Q100.2656,183.6875 101.5781,182.0313 Q102.9063,180.375 105.4063,180.375 Q106.1094,180.375 106.75,180.5313 Q107.4063,180.6875 107.9688,180.9844 L107.9688,183.7031 Q107.3438,183.125 106.75,182.8594 Q106.1563,182.5781 105.5313,182.5781 Q104.1875,182.5781 103.5,183.6563 Q102.8125,184.7188 102.8125,186.8125 Q102.8125,188.9063 103.5,189.9844 Q104.1875,191.0469 105.5313,191.0469 Q106.1563,191.0469 106.75,190.7813 Q107.3438,190.5 107.9688,189.9219 L107.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="119" y="191.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
       <ellipse cx="399" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.9688,192.6406 Q401.3906,192.9375 400.75,193.0781 Q400.1094,193.2344 399.4063,193.2344 Q396.9063,193.2344 395.5781,191.5938 Q394.2656,189.9375 394.2656,186.8125 Q394.2656,183.6875 395.5781,182.0313 Q396.9063,180.375 399.4063,180.375 Q400.1094,180.375 400.75,180.5313 Q401.4063,180.6875 401.9688,180.9844 L401.9688,183.7031 Q401.3438,183.125 400.75,182.8594 Q400.1563,182.5781 399.5313,182.5781 Q398.1875,182.5781 397.5,183.6563 Q396.8125,184.7188 396.8125,186.8125 Q396.8125,188.9063 397.5,189.9844 Q398.1875,191.0469 399.5313,191.0469 Q400.1563,191.0469 400.75,190.7813 Q401.3438,190.5 401.9688,189.9219 L401.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="413" y="191.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvbo9f210atk)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwr477b1ljvk8)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
       <ellipse cx="358.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.2188,29.6406 Q360.6406,29.9375 360,30.0781 Q359.3594,30.2344 358.6563,30.2344 Q356.1563,30.2344 354.8281,28.5938 Q353.5156,26.9375 353.5156,23.8125 Q353.5156,20.6875 354.8281,19.0313 Q356.1563,17.375 358.6563,17.375 Q359.3594,17.375 360,17.5313 Q360.6563,17.6875 361.2188,17.9844 L361.2188,20.7031 Q360.5938,20.125 360,19.8594 Q359.4063,19.5781 358.7813,19.5781 Q357.4375,19.5781 356.75,20.6563 Q356.0625,21.7188 356.0625,23.8125 Q356.0625,25.9063 356.75,26.9844 Q357.4375,28.0469 358.7813,28.0469 Q359.4063,28.0469 360,27.7813 Q360.5938,27.5 361.2188,26.9219 L361.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="378.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="54"/>
       <ellipse cx="290.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="299.5" y="62.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="66.8047"/>
       <ellipse cx="290.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="299.5" y="75.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="79.6094"/>
       <ellipse cx="290.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="299.5" y="87.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <path d="M341.26,106.77 C339.11,112.52 337.14,118.33 335.5,124 C331.06,139.36 328.29,157.18 326.65,170.99 " fill="none" id="C_0000348749731659902910&lt;-C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg
index 27cfdc73..781ce2ac 100644
--- a/docs/test_cases/t00029_class_mermaid.svg
+++ b/docs/test_cases/t00029_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 779.5 286" style="max-width: 779.5px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 777.734375 286" style="max-width: 777.734px; background-color: white;" width="777.734375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,11 +50,11 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M645.4525748239437,142L642.4123019366198,149.5C639.3720290492957,157,633.2914832746479,172,630.251210387324,185.16666666666666C627.2109375,198.33333333333334,627.2109375,209.66666666666666,627.2109375,215.33333333333334L627.2109375,221"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M695.3130501760563,142L698.3533230633802,149.5C701.3935959507043,157,707.4741417253521,172,710.514414612676,185.16666666666666C713.5546875,198.33333333333334,713.5546875,209.66666666666666,713.5546875,215.33333333333334L713.5546875,221"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M643.6869498239437,142L640.6466769366198,149.5C637.6064040492957,157,631.5258582746479,172,628.485585387324,185.16666666666666C625.4453125,198.33333333333334,625.4453125,209.66666666666666,625.4453125,215.33333333333334L625.4453125,221"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M693.5474251760563,142L696.5876980633802,149.5C699.6279709507043,157,705.7085167253521,172,708.748789612676,185.16666666666666C711.7890625,198.33333333333334,711.7890625,209.66666666666666,711.7890625,215.33333333333334L711.7890625,221"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(627.2109375, 187)" class="edgeLabel">
+        <g transform="translate(625.4453125, 187)" class="edgeLabel">
           <g transform="translate(-13.5703125, -9)" class="label">
             <foreignObject height="18" width="27.140625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -65,7 +65,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(713.5546875, 187)" class="edgeLabel">
+        <g transform="translate(711.7890625, 187)" class="edgeLabel">
           <g transform="translate(-13.5703125, -9)" class="label">
             <foreignObject height="18" width="27.140625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L7">
+        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L7">
           <g title="A" id="classId-C_0001970994826766369014-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -97,7 +97,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L12">
+        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L12">
           <g title="C" id="classId-C_0000543766389270348470-1" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -121,15 +121,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(284.8203125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L21">
+        <a transform="translate(283.9375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L21">
           <g title="E" id="classId-C_0001936873082456592219-2" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -5.3359375, -43)" height="18" width="10.671875" class="classTitle">
@@ -137,17 +137,17 @@
                   <span class="nodeLabel">E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="26.703125">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="26.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">one</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="24.90625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="24.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">two</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="36.46875">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="36.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">three</span>
                 </div>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(627.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L26">
+        <a transform="translate(625.4453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L26">
           <g title="G1" id="classId-C_0001980718063838190763-3" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(414.75, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L28">
+        <a transform="translate(412.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L28">
           <g title="G2" id="classId-C_0002204627213593766591-4" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(501.09375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L30">
+        <a transform="translate(499.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L30">
           <g title="G3" id="classId-C_0000767180516665070631-5" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(713.5546875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L32">
+        <a transform="translate(711.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L32">
           <g title="G4" id="classId-C_0000715074622924270214-6" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -231,7 +231,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(670.3828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00029/t00029.cc#L34">
+        <a transform="translate(668.6171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00029/t00029.cc#L34">
           <g title="R" id="classId-C_0000348749731659902910-7" class="node default clickable">
             <rect height="123" width="202.234375" y="-61.5" x="-101.1171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="101.1171875" x1="-101.1171875" class="divider"/>
diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md
index 9978f9ca..76522228 100644
--- a/docs/test_cases/t00030.md
+++ b/docs/test_cases/t00030.md
@@ -279,7 +279,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index c453f91a..7374e73d 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_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="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fixpz1f5a6lpc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1gk79juqvlsok" 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"/>
@@ -9,87 +9,87 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
       <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
       <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
       <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
       <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fixpz1f5a6lpc)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gk79juqvlsok)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
       <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="54"/>
       <ellipse cx="120" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="62.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="66.8047"/>
       <ellipse cx="120" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="75.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="79.6094"/>
       <ellipse cx="120" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="87.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="92.4141"/>
       <ellipse cx="120" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="100.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="105.2188"/>
       <ellipse cx="120" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="113.4292">eee : E *</text>
     </a>
     <path d="M111.59,120.19 C100.65,129.74 89.75,139.87 80,150 C67.26,163.23 54.64,179.38 44.8,192.83 " fill="none" id="C_0000263468735940481091-&gt;C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg
index cb269976..c3126a44 100644
--- a/docs/test_cases/t00030_class_mermaid.svg
+++ b/docs/test_cases/t00030_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 358.4279479980469 308" style="max-width: 358.428px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 358.4279479980469 308" style="max-width: 358.428px; background-color: white;" width="358.4279479980469" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -164,7 +164,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L7">
+        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L7">
           <g title="A" id="classId-C_0000064769484767514424-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -183,7 +183,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L9">
+        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L9">
           <g title="B" id="classId-C_0000156923198106222307-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -202,7 +202,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L11">
+        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L11">
           <g title="C" id="classId-C_0001651557398557662399-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -221,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L13">
+        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L13">
           <g title="D" id="classId-C_0001089781072752262158-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -240,7 +240,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L15">
+        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L15">
           <g title="E" id="classId-C_0000425964641881054607-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -259,7 +259,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00030/t00030.cc#L17">
+        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00030/t00030.cc#L17">
           <g title="R" id="classId-C_0000263468735940481091-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md
index 92883c60..c4189cc1 100644
--- a/docs/test_cases/t00031.md
+++ b/docs/test_cases/t00031.md
@@ -334,7 +334,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index bc60d6a0..bbeb27af 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,33 +1,33 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:353px;height:415px;" version="1.1" viewBox="0 0 353 415" width="353px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="gsg79c1br93qs0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g1y20kdh0spgo40" x1="0%" x2="100%" y1="50%" y2="50%">
       <stop offset="0%" stop-color="#90EE90"/>
       <stop offset="100%" stop-color="#FFFF00"/>
     </linearGradient>
-    <filter height="300%" id="fsg79c1br93qs" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1y20kdh0spgo4" 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"/>
       <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
     </filter>
-    <linearGradient id="gsg79c1br93qs1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="g1y20kdh0spgo41" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#gsg79c1br93qs0)" filter="url(#fsg79c1br93qs)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
-      <rect fill="url(#gsg79c1br93qs1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g1y20kdh0spgo40)" filter="url(#f1y20kdh0spgo4)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+      <rect fill="url(#g1y20kdh0spgo41)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
       <ellipse cx="21" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,237.6406 Q23.3906,237.9375 22.75,238.0781 Q22.1094,238.2344 21.4063,238.2344 Q18.9063,238.2344 17.5781,236.5938 Q16.2656,234.9375 16.2656,231.8125 Q16.2656,228.6875 17.5781,227.0313 Q18.9063,225.375 21.4063,225.375 Q22.1094,225.375 22.75,225.5313 Q23.4063,225.6875 23.9688,225.9844 L23.9688,228.7031 Q23.3438,228.125 22.75,227.8594 Q22.1563,227.5781 21.5313,227.5781 Q20.1875,227.5781 19.5,228.6563 Q18.8125,229.7188 18.8125,231.8125 Q18.8125,233.9063 19.5,234.9844 Q20.1875,236.0469 21.5313,236.0469 Q22.1563,236.0469 22.75,235.7813 Q23.3438,235.5 23.9688,234.9219 L23.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="236.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsg79c1br93qs)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1y20kdh0spgo4)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
       <ellipse cx="118.9" cy="213" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M123.0094,219 L115.2906,219 L115.2906,206.6094 L123.0094,206.6094 L123.0094,208.7656 L117.7438,208.7656 L117.7438,211.4375 L122.5094,211.4375 L122.5094,213.5938 L117.7438,213.5938 L117.7438,216.8438 L123.0094,216.8438 L123.0094,219 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="133.1" y="217.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="109" y="268.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="275.4141" y2="275.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#fsg79c1br93qs)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f1y20kdh0spgo4)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <ellipse cx="298.2" cy="360" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M301.1688,365.6406 Q300.5906,365.9375 299.95,366.0781 Q299.3094,366.2344 298.6063,366.2344 Q296.1063,366.2344 294.7781,364.5938 Q293.4656,362.9375 293.4656,359.8125 Q293.4656,356.6875 294.7781,355.0313 Q296.1063,353.375 298.6063,353.375 Q299.3094,353.375 299.95,353.5313 Q300.6063,353.6875 301.1688,353.9844 L301.1688,356.7031 Q300.5438,356.125 299.95,355.8594 Q299.3563,355.5781 298.7313,355.5781 Q297.3875,355.5781 296.7,356.6563 Q296.0125,357.7188 296.0125,359.8125 Q296.0125,361.9063 296.7,362.9844 Q297.3875,364.0469 298.7313,364.0469 Q299.3563,364.0469 299.95,363.7813 Q300.5438,363.5 301.1688,362.9219 L301.1688,365.6406 Z "/>
@@ -48,23 +48,23 @@
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="376" y2="376"/>
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="384" y2="384"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="390"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="288.5" y="392"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="300.5" y="398.2104">ttt : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsg79c1br93qs)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1y20kdh0spgo4)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
       <ellipse cx="217.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M220.4688,237.6406 Q219.8906,237.9375 219.25,238.0781 Q218.6094,238.2344 217.9063,238.2344 Q215.4063,238.2344 214.0781,236.5938 Q212.7656,234.9375 212.7656,231.8125 Q212.7656,228.6875 214.0781,227.0313 Q215.4063,225.375 217.9063,225.375 Q218.6094,225.375 219.25,225.5313 Q219.9063,225.6875 220.4688,225.9844 L220.4688,228.7031 Q219.8438,228.125 219.25,227.8594 Q218.6563,227.5781 218.0313,227.5781 Q216.6875,227.5781 216,228.6563 Q215.3125,229.7188 215.3125,231.8125 Q215.3125,233.9063 216,234.9844 Q216.6875,236.0469 218.0313,236.0469 Q218.6563,236.0469 219.25,235.7813 Q219.8438,235.5 220.4688,234.9219 L220.4688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="231.5" y="236.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsg79c1br93qs)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1y20kdh0spgo4)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
       <ellipse cx="294" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M296.9688,237.6406 Q296.3906,237.9375 295.75,238.0781 Q295.1094,238.2344 294.4063,238.2344 Q291.9063,238.2344 290.5781,236.5938 Q289.2656,234.9375 289.2656,231.8125 Q289.2656,228.6875 290.5781,227.0313 Q291.9063,225.375 294.4063,225.375 Q295.1094,225.375 295.75,225.5313 Q296.4063,225.6875 296.9688,225.9844 L296.9688,228.7031 Q296.3438,228.125 295.75,227.8594 Q295.1563,227.5781 294.5313,227.5781 Q293.1875,227.5781 292.5,228.6563 Q291.8125,229.7188 291.8125,231.8125 Q291.8125,233.9063 292.5,234.9844 Q293.1875,236.0469 294.5313,236.0469 Q295.1563,236.0469 295.75,235.7813 Q296.3438,235.5 296.9688,234.9219 L296.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="308" y="236.1543">C</text>
@@ -73,47 +73,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsg79c1br93qs)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1y20kdh0spgo4)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
       <ellipse cx="136.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M139.7188,29.6406 Q139.1406,29.9375 138.5,30.0781 Q137.8594,30.2344 137.1563,30.2344 Q134.6563,30.2344 133.3281,28.5938 Q132.0156,26.9375 132.0156,23.8125 Q132.0156,20.6875 133.3281,19.0313 Q134.6563,17.375 137.1563,17.375 Q137.8594,17.375 138.5,17.5313 Q139.1563,17.6875 139.7188,17.9844 L139.7188,20.7031 Q139.0938,20.125 138.5,19.8594 Q137.9063,19.5781 137.2813,19.5781 Q135.9375,19.5781 135.25,20.6563 Q134.5625,21.7188 134.5625,23.8125 Q134.5625,25.9063 135.25,26.9844 Q135.9375,28.0469 137.2813,28.0469 Q137.9063,28.0469 138.5,27.7813 Q139.0938,27.5 139.7188,26.9219 L139.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="46"/>
       <ellipse cx="83" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="92" y="54.2104">add_b(B b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="66.8047"/>
       <ellipse cx="83" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="92" y="75.0151">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="79.6094"/>
       <ellipse cx="83" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="92" y="87.8198">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="92.4141"/>
       <ellipse cx="83" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="92" y="100.6245">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="105.2188"/>
       <ellipse cx="83" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="92" y="113.4292">ddd : D *</text>
     </a>
     <path d="M309,264.08 C309,280.48 309,303.13 309,323.57 " fill="none" id="C_0000208700529175860645-&gt;C_0000116209144733282955" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg
index 1f5a6c06..6e6ae3cb 100644
--- a/docs/test_cases/t00031_class_mermaid.svg
+++ b/docs/test_cases/t00031_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 412.1796875 525" style="max-width: 412.18px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 410.4140625 525" style="max-width: 410.414px; background-color: white;" width="410.4140625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,28 +50,32 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M371.78125,344L371.78125,355.5C371.78125,367,371.78125,390,371.78125,405.6666666666667C371.78125,421.3333333333333,371.78125,429.6666666666667,371.78125,433.8333333333333L371.78125,438"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M130.12603058510638,175L126.36414007092198,180.66666666666666C122.60224955673759,186.33333333333334,115.07846852836879,197.66666666666666,113.63154769337063,209C112.18462685837245,220.33333333333334,116.81456621674492,231.66666666666666,119.12953589593114,237.33333333333334L121.44450557511738,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M101.78515625,153.20037462354009L89.158203125,162.5003121862834C76.53125,171.80024974902673,51.27734375,190.40012487451335,38.650390625,212.70006243725666C26.0234375,235,26.0234375,261,26.0234375,274L26.0234375,287"/>
-        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M185.55859375,175L185.55859375,180.66666666666666C185.55859375,186.33333333333334,185.55859375,197.66666666666666,183.72312084311423,209C181.8876479362285,220.33333333333334,178.21670212245695,231.66666666666666,176.3812292155712,237.33333333333334L174.54575630868544,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M269.33203125,144.35811675371804L286.4069010416667,155.1317639614317C303.4817708333333,165.90541116914537,337.6315104166667,187.45270558457267,354.7063802083333,211.22635279228635C371.78125,235,371.78125,261,371.78125,274L371.78125,287"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M249.9018949468085,175L254.2685062056738,180.66666666666666C258.635117464539,186.33333333333334,267.3683399822695,197.66666666666666,271.73495124113475,216.33333333333334C276.1015625,235,276.1015625,261,276.1015625,274L276.1015625,287"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M370.015625,344L370.015625,355.5C370.015625,367,370.015625,390,370.015625,405.6666666666667C370.015625,421.3333333333333,370.015625,429.6666666666667,370.015625,433.8333333333333L370.015625,438"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M129.4291722074468,175L125.70985704787233,180.66666666666666C121.99054188829787,186.33333333333334,114.55191156914894,197.66666666666666,113.12407968422235,209C111.69624779929579,220.33333333333334,116.27921434859155,231.66666666666666,118.57069762323944,237.33333333333334L120.86218089788733,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M100.4609375,153.71680410843908L88.0546875,162.9306700903659C75.6484375,172.1445360722927,50.8359375,190.57226803614637,38.4296875,212.7861340180732C26.0234375,235,26.0234375,261,26.0234375,274L26.0234375,287"/>
+        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M184.234375,175L184.234375,180.66666666666666C184.234375,186.33333333333334,184.234375,197.66666666666666,182.42238849765258,209C180.61040199530518,220.33333333333334,176.98642899061034,231.66666666666666,175.1744424882629,237.33333333333334L173.3624559859155,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M268.0078125,144.4837047939445L285.0091145833333,155.23642066162043C302.0104166666667,165.98913652929633,336.0130208333333,187.49456826464817,353.0143229166667,211.2472841323241C370.015625,235,370.015625,261,370.015625,274L370.015625,287"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.2639960106383,175L252.6093195921986,180.66666666666666C256.9546431737588,186.33333333333334,265.64529033687944,197.66666666666666,269.9906139184397,216.33333333333334C274.3359375,235,274.3359375,261,274.3359375,274L274.3359375,287"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -87,7 +91,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(185.55859375, 209)" class="edgeLabel">
+        <g transform="translate(184.234375, 209)" class="edgeLabel">
           <g transform="translate(-18.0234375, -9)" class="label">
             <foreignObject height="18" width="36.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -98,7 +102,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(371.78125, 209)" class="edgeLabel">
+        <g transform="translate(370.015625, 209)" class="edgeLabel">
           <g transform="translate(-16.671875, -9)" class="label">
             <foreignObject height="18" width="33.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -109,7 +113,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(276.1015625, 209)" class="edgeLabel">
+        <g transform="translate(274.3359375, 209)" class="edgeLabel">
           <g transform="translate(-18.0234375, -9)" class="label">
             <foreignObject height="18" width="36.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -122,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L8">
+        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L8">
           <g title="A" id="classId-C_0000847775539502907247-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -141,15 +145,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.0625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L11">
+        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L11">
           <g title="B" id="classId-C_0001441796358326382179-1" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -5.78125, -43)" height="18" width="11.5625" class="classTitle">
@@ -157,17 +161,17 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="26.703125">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="26.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">one</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="24.90625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="24.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">two</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="36.46875">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="36.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">three</span>
                 </div>
@@ -175,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.78125, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000116209144733282955-2" class="node default clickable">
             <rect height="79" width="56.484375" y="-39.5" x="-28.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.2421875" x1="-28.2421875" class="divider"/>
@@ -199,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(276.1015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L18">
+        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L18">
           <g title="D" id="classId-C_0002266534344475505157-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -218,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.78125, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000208700529175860645-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -237,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.55859375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00031/t00031.cc#L20">
+        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00031/t00031.cc#L20">
           <g title="R" id="classId-C_0000484712092364868032-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md
index 39c61b99..a89bcbd6 100644
--- a/docs/test_cases/t00032.md
+++ b/docs/test_cases/t00032.md
@@ -429,7 +429,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index a347a031..19b48ccc 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_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="326px" preserveAspectRatio="none" style="width:850px;height:326px;" version="1.1" viewBox="0 0 850 326" width="850px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fuy3csp9hadhb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fv17jgt3fnmxv" 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"/>
@@ -9,69 +9,69 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
       <ellipse cx="159.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M162.4688,167.6406 Q161.8906,167.9375 161.25,168.0781 Q160.6094,168.2344 159.9063,168.2344 Q157.4063,168.2344 156.0781,166.5938 Q154.7656,164.9375 154.7656,161.8125 Q154.7656,158.6875 156.0781,157.0313 Q157.4063,155.375 159.9063,155.375 Q160.6094,155.375 161.25,155.5313 Q161.9063,155.6875 162.4688,155.9844 L162.4688,158.7031 Q161.8438,158.125 161.25,157.8594 Q160.6563,157.5781 160.0313,157.5781 Q158.6875,157.5781 158,158.6563 Q157.3125,159.7188 157.3125,161.8125 Q157.3125,163.9063 158,164.9844 Q158.6875,166.0469 160.0313,166.0469 Q160.6563,166.0469 161.25,165.7813 Q161.8438,165.5 162.4688,164.9219 L162.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="173.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
       <ellipse cx="21" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,36.1406 Q23.3906,36.4375 22.75,36.5781 Q22.1094,36.7344 21.4063,36.7344 Q18.9063,36.7344 17.5781,35.0938 Q16.2656,33.4375 16.2656,30.3125 Q16.2656,27.1875 17.5781,25.5313 Q18.9063,23.875 21.4063,23.875 Q22.1094,23.875 22.75,24.0313 Q23.4063,24.1875 23.9688,24.4844 L23.9688,27.2031 Q23.3438,26.625 22.75,26.3594 Q22.1563,26.0781 21.5313,26.0781 Q20.1875,26.0781 19.5,27.1563 Q18.8125,28.2188 18.8125,30.3125 Q18.8125,32.4063 19.5,33.4844 Q20.1875,34.5469 21.5313,34.5469 Q22.1563,34.5469 22.75,34.2813 Q23.3438,34 23.9688,33.4219 L23.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="35" y="34.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
       <ellipse cx="165.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.7188,29.6406 Q168.1406,29.9375 167.5,30.0781 Q166.8594,30.2344 166.1563,30.2344 Q163.6563,30.2344 162.3281,28.5938 Q161.0156,26.9375 161.0156,23.8125 Q161.0156,20.6875 162.3281,19.0313 Q163.6563,17.375 166.1563,17.375 Q166.8594,17.375 167.5,17.5313 Q168.1563,17.6875 168.7188,17.9844 L168.7188,20.7031 Q168.0938,20.125 167.5,19.8594 Q166.9063,19.5781 166.2813,19.5781 Q164.9375,19.5781 164.25,20.6563 Q163.5625,21.7188 163.5625,23.8125 Q163.5625,25.9063 164.25,26.9844 Q164.9375,28.0469 166.2813,28.0469 Q166.9063,28.0469 167.5,27.7813 Q168.0938,27.5 168.7188,26.9219 L168.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="186.25" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="131" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
       <ellipse cx="326.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M329.7188,29.6406 Q329.1406,29.9375 328.5,30.0781 Q327.8594,30.2344 327.1563,30.2344 Q324.6563,30.2344 323.3281,28.5938 Q322.0156,26.9375 322.0156,23.8125 Q322.0156,20.6875 323.3281,19.0313 Q324.6563,17.375 327.1563,17.375 Q327.8594,17.375 328.5,17.5313 Q329.1563,17.6875 329.7188,17.9844 L329.7188,20.7031 Q329.0938,20.125 328.5,19.8594 Q327.9063,19.5781 327.2813,19.5781 Q325.9375,19.5781 325.25,20.6563 Q324.5625,21.7188 324.5625,23.8125 Q324.5625,25.9063 325.25,26.9844 Q325.9375,28.0469 327.2813,28.0469 Q327.9063,28.0469 328.5,27.7813 Q329.0938,27.5 329.7188,26.9219 L329.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="347.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="278" y="46"/>
       <ellipse cx="283" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="292" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
       <ellipse cx="487.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M490.7188,29.6406 Q490.1406,29.9375 489.5,30.0781 Q488.8594,30.2344 488.1563,30.2344 Q485.6563,30.2344 484.3281,28.5938 Q483.0156,26.9375 483.0156,23.8125 Q483.0156,20.6875 484.3281,19.0313 Q485.6563,17.375 488.1563,17.375 Q488.8594,17.375 489.5,17.5313 Q490.1563,17.6875 490.7188,17.9844 L490.7188,20.7031 Q490.0938,20.125 489.5,19.8594 Q488.9063,19.5781 488.2813,19.5781 Q486.9375,19.5781 486.25,20.6563 Q485.5625,21.7188 485.5625,23.8125 Q485.5625,25.9063 486.25,26.9844 Q486.9375,28.0469 488.2813,28.0469 Q488.9063,28.0469 489.5,27.7813 Q490.0938,27.5 490.7188,26.9219 L490.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508.25" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="439" y="46"/>
       <ellipse cx="444" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="453" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
       <ellipse cx="142" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M144.9688,276.6406 Q144.3906,276.9375 143.75,277.0781 Q143.1094,277.2344 142.4063,277.2344 Q139.9063,277.2344 138.5781,275.5938 Q137.2656,273.9375 137.2656,270.8125 Q137.2656,267.6875 138.5781,266.0313 Q139.9063,264.375 142.4063,264.375 Q143.1094,264.375 143.75,264.5313 Q144.4063,264.6875 144.9688,264.9844 L144.9688,267.7031 Q144.3438,267.125 143.75,266.8594 Q143.1563,266.5781 142.5313,266.5781 Q141.1875,266.5781 140.5,267.6563 Q139.8125,268.7188 139.8125,270.8125 Q139.8125,272.9063 140.5,273.9844 Q141.1875,275.0469 142.5313,275.0469 Q143.1563,275.0469 143.75,274.7813 Q144.3438,274.5 144.9688,273.9219 L144.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="156" y="275.1543">Overload</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133" y="301"/>
       <ellipse cx="138" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="147" y="309.2104">counter : L</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
       <ellipse cx="258" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,167.6406 Q260.3906,167.9375 259.75,168.0781 Q259.1094,168.2344 258.4063,168.2344 Q255.9063,168.2344 254.5781,166.5938 Q253.2656,164.9375 253.2656,161.8125 Q253.2656,158.6875 254.5781,157.0313 Q255.9063,155.375 258.4063,155.375 Q259.1094,155.375 259.75,155.5313 Q260.4063,155.6875 260.9688,155.9844 L260.9688,158.7031 Q260.3438,158.125 259.75,157.8594 Q259.1563,157.5781 258.5313,157.5781 Q257.1875,157.5781 256.5,158.6563 Q255.8125,159.7188 255.8125,161.8125 Q255.8125,163.9063 256.5,164.9844 Q257.1875,166.0469 258.5313,166.0469 Q259.1563,166.0469 259.75,165.7813 Q260.3438,165.5 260.9688,164.9219 L260.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="272" y="166.1543">Overload</text>
@@ -97,19 +97,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuy3csp9hadhb)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv17jgt3fnmxv)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
       <ellipse cx="708.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M711.7188,29.6406 Q711.1406,29.9375 710.5,30.0781 Q709.8594,30.2344 709.1563,30.2344 Q706.6563,30.2344 705.3281,28.5938 Q704.0156,26.9375 704.0156,23.8125 Q704.0156,20.6875 705.3281,19.0313 Q706.6563,17.375 709.1563,17.375 Q709.8594,17.375 710.5,17.5313 Q711.1563,17.6875 711.7188,17.9844 L711.7188,20.7031 Q711.0938,20.125 710.5,19.8594 Q709.9063,19.5781 709.2813,19.5781 Q707.9375,19.5781 707.25,20.6563 Q706.5625,21.7188 706.5625,23.8125 Q706.5625,25.9063 707.25,26.9844 Q707.9375,28.0469 709.2813,28.0469 Q709.9063,28.0469 710.5,27.7813 Q711.0938,27.5 711.7188,26.9219 L711.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="729.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="600.5" y="54"/>
       <ellipse cx="605.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="614.5" y="62.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <path d="M183.61,214.17 C186,227.73 188.58,242.4 190.77,254.81 " fill="none" id="C_0001619396229227632210&lt;-C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg
index 978d59ff..83a16aac 100644
--- a/docs/test_cases/t00032_class_mermaid.svg
+++ b/docs/test_cases/t00032_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1043.375 349" style="max-width: 1043.38px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1043.375 349" style="max-width: 1043.38px; background-color: white;" width="1043.375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -68,11 +68,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -126,7 +128,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L7">
+        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L7">
           <g title="Base" id="classId-C_0001619396229227632210-0" class="node default clickable">
             <rect height="57" width="53.25" y="-28.5" x="-26.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="26.625" x1="-26.625" class="divider"/>
@@ -145,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L9">
+        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L9">
           <g title="TBase" id="classId-C_0000543776954602127752-1" class="node default clickable">
             <rect height="57" width="63.03125" y="-28.5" x="-31.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.515625" x1="-31.515625" class="divider"/>
@@ -164,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L11">
+        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L11">
           <g title="A" id="classId-C_0000687909853333071234-2" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -188,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L15">
+        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L15">
           <g title="B" id="classId-C_0000737235057776029746-3" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -212,7 +214,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L19">
+        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L19">
           <g title="C" id="classId-C_0001497964256865073382-4" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -236,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24">
+        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001463422997970691679-5" class="node default clickable">
             <rect height="79" width="160.53125" y="-39.5" x="-80.265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="80.265625" x1="-80.265625" class="divider"/>
@@ -260,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L24">
+        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001706455047176879286-6" class="node default clickable">
             <rect height="57" width="223.0625" y="-28.5" x="-111.53125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.53125" x1="-111.53125" class="divider"/>
@@ -279,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00032/t00032.cc#L31">
+        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00032/t00032.cc#L31">
           <g title="R" id="classId-C_0000085539867332573320-7" class="node default clickable">
             <rect height="79" width="296.484375" y="-39.5" x="-148.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="148.2421875" x1="-148.2421875" class="divider"/>
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index cc153e41..ced2d5af 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -377,7 +377,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 6a83d9d2..1568f5cc 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_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="570px" preserveAspectRatio="none" style="width:435px;height:570px;" version="1.1" viewBox="0 0 435 570" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2poxmsv9gxz8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18hc61r1oi8uo" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
       <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="301"/>
       <ellipse cx="87.5" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="309.2104">aaa : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
       <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="417" y2="417"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="423"/>
       <ellipse cx="219.5" cy="428" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="431.2104">bbb : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
       <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
@@ -53,30 +53,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="545"/>
       <ellipse cx="264" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="553.2104">ccc : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
       <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="545"/>
       <ellipse cx="362" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="553.2104">ddd : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
       <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
@@ -85,8 +85,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="415.5" y2="415.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="423.5" y2="423.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
       <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
@@ -95,8 +95,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="293.5" y2="293.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="301.5" y2="301.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
       <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
@@ -105,19 +105,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2poxmsv9gxz8)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18hc61r1oi8uo)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
       <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="62.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0001609446044604054241-&gt;C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg
index 49b807b4..5726ca14 100644
--- a/docs/test_cases/t00033_class_mermaid.svg
+++ b/docs/test_cases/t00033_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 415.41796875 607" style="max-width: 415.418px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 415.41796875 607" style="max-width: 415.418px; background-color: white;" width="415.41796875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -59,56 +59,68 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M151.828125,87L151.828125,92.66666666666667C151.828125,98.33333333333333,151.828125,109.66666666666667,151.828125,121C151.828125,132.33333333333334,151.828125,143.66666666666666,151.828125,149.33333333333334L151.828125,155"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -126,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7">
+        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0002036031998980633871-0" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -150,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L11">
+        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L11">
           <g title="B" id="classId-C_0000765515233845859023-1" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -174,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L15">
+        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L15">
           <g title="C" id="classId-C_0001436835384265552869-2" class="node default clickable">
             <rect height="79" width="71.171875" y="-39.5" x="-35.5859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.5859375" x1="-35.5859375" class="divider"/>
@@ -198,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L19">
+        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L19">
           <g title="D" id="classId-C_0002199581366769423637-3" class="node default clickable">
             <rect height="79" width="81.28125" y="-39.5" x="-40.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.640625" x1="-40.640625" class="divider"/>
@@ -222,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
+        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/../../../../usr/include/c++/11/bits/unique_ptr.h#L242">
           <g title="C" id="classId-C_0001609446044604054241-4" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -241,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7">
+        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7">
           <g title="B" id="classId-C_0000384927316081978893-5" class="node default clickable">
             <rect height="57" width="223.046875" y="-28.5" x="-111.5234375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.5234375" x1="-111.5234375" class="divider"/>
@@ -260,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L7">
+        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0001747493965420341251-6" class="node default clickable">
             <rect height="57" width="253.296875" y="-28.5" x="-126.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="126.6484375" x1="-126.6484375" class="divider"/>
@@ -279,7 +291,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00033/t00033.cc#L23">
+        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00033/t00033.cc#L23">
           <g title="R" id="classId-C_0001866392706312766470-7" class="node default clickable">
             <rect height="79" width="287.65625" y="-39.5" x="-143.828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="143.828125" x1="-143.828125" class="divider"/>
diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md
index 2f694724..e6dac289 100644
--- a/docs/test_cases/t00034.md
+++ b/docs/test_cases/t00034.md
@@ -353,7 +353,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index e08d0b05..06b3d655 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_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="243px" preserveAspectRatio="none" style="width:788px;height:243px;" version="1.1" viewBox="0 0 788 243" width="788px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7s9la8aq6b5k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fh3khwxcw63g" 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"/>
@@ -9,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
       <ellipse cx="140.75" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M143.7188,180.6406 Q143.1406,180.9375 142.5,181.0781 Q141.8594,181.2344 141.1563,181.2344 Q138.6563,181.2344 137.3281,179.5938 Q136.0156,177.9375 136.0156,174.8125 Q136.0156,171.6875 137.3281,170.0313 Q138.6563,168.375 141.1563,168.375 Q141.8594,168.375 142.5,168.5313 Q143.1563,168.6875 143.7188,168.9844 L143.7188,171.7031 Q143.0938,171.125 142.5,170.8594 Q141.9063,170.5781 141.2813,170.5781 Q139.9375,170.5781 139.25,171.6563 Q138.5625,172.7188 138.5625,174.8125 Q138.5625,176.9063 139.25,177.9844 Q139.9375,179.0469 141.2813,179.0469 Q141.9063,179.0469 142.5,178.7813 Q143.0938,178.5 143.7188,177.9219 L143.7188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="161.25" y="179.1543">Void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="191" y2="191"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="197"/>
       <ellipse cx="17" cy="202" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="273" x="26" y="205.2104">operator!=(const Void &amp;) constexpr const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="209.8047"/>
       <ellipse cx="17" cy="214.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="279" x="26" y="218.0151">operator==(const Void &amp;) constexpr const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="224.6094" y2="224.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
       <ellipse cx="508" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M510.9688,193.6406 Q510.3906,193.9375 509.75,194.0781 Q509.1094,194.2344 508.4063,194.2344 Q505.9063,194.2344 504.5781,192.5938 Q503.2656,190.9375 503.2656,187.8125 Q503.2656,184.6875 504.5781,183.0313 Q505.9063,181.375 508.4063,181.375 Q509.1094,181.375 509.75,181.5313 Q510.4063,181.6875 510.9688,181.9844 L510.9688,184.7031 Q510.3438,184.125 509.75,183.8594 Q509.1563,183.5781 508.5313,183.5781 Q507.1875,183.5781 506.5,184.6563 Q505.8125,185.7188 505.8125,187.8125 Q505.8125,189.9063 506.5,190.9844 Q507.1875,192.0469 508.5313,192.0469 Q509.1563,192.0469 509.75,191.7813 Q510.3438,191.5 510.9688,190.9219 L510.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="522" y="192.1543">lift_void</text>
@@ -41,8 +41,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
       <ellipse cx="499" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,42.6406 Q501.3906,42.9375 500.75,43.0781 Q500.1094,43.2344 499.4063,43.2344 Q496.9063,43.2344 495.5781,41.5938 Q494.2656,39.9375 494.2656,36.8125 Q494.2656,33.6875 495.5781,32.0313 Q496.9063,30.375 499.4063,30.375 Q500.1094,30.375 500.75,30.5313 Q501.4063,30.6875 501.9688,30.9844 L501.9688,33.7031 Q501.3438,33.125 500.75,32.8594 Q500.1563,32.5781 499.5313,32.5781 Q498.1875,32.5781 497.5,33.6563 Q496.8125,34.7188 496.8125,36.8125 Q496.8125,38.9063 497.5,39.9844 Q498.1875,41.0469 499.5313,41.0469 Q500.1563,41.0469 500.75,40.7813 Q501.3438,40.5 501.9688,39.9219 L501.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="513" y="41.1543">lift_void</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
       <ellipse cx="361" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.9688,193.6406 Q363.3906,193.9375 362.75,194.0781 Q362.1094,194.2344 361.4063,194.2344 Q358.9063,194.2344 357.5781,192.5938 Q356.2656,190.9375 356.2656,187.8125 Q356.2656,184.6875 357.5781,183.0313 Q358.9063,181.375 361.4063,181.375 Q362.1094,181.375 362.75,181.5313 Q363.4063,181.6875 363.9688,181.9844 L363.9688,184.7031 Q363.3438,184.125 362.75,183.8594 Q362.1563,183.5781 361.5313,183.5781 Q360.1875,183.5781 359.5,184.6563 Q358.8125,185.7188 358.8125,187.8125 Q358.8125,189.9063 359.5,190.9844 Q360.1875,192.0469 361.5313,192.0469 Q362.1563,192.0469 362.75,191.7813 Q363.3438,191.5 363.9688,190.9219 L363.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="375" y="192.1543">drop_void</text>
@@ -61,8 +61,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
       <ellipse cx="227" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.9688,42.6406 Q229.3906,42.9375 228.75,43.0781 Q228.1094,43.2344 227.4063,43.2344 Q224.9063,43.2344 223.5781,41.5938 Q222.2656,39.9375 222.2656,36.8125 Q222.2656,33.6875 223.5781,32.0313 Q224.9063,30.375 227.4063,30.375 Q228.1094,30.375 228.75,30.5313 Q229.4063,30.6875 229.9688,30.9844 L229.9688,33.7031 Q229.3438,33.125 228.75,32.8594 Q228.1563,32.5781 227.5313,32.5781 Q226.1875,32.5781 225.5,33.6563 Q224.8125,34.7188 224.8125,36.8125 Q224.8125,38.9063 225.5,39.9844 Q226.1875,41.0469 227.5313,41.0469 Q228.1563,41.0469 228.75,40.7813 Q229.3438,40.5 229.9688,39.9219 L229.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="241" y="41.1543">drop_void</text>
@@ -71,34 +71,34 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
       <ellipse cx="696.5" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M699.4688,193.6406 Q698.8906,193.9375 698.25,194.0781 Q697.6094,194.2344 696.9063,194.2344 Q694.4063,194.2344 693.0781,192.5938 Q691.7656,190.9375 691.7656,187.8125 Q691.7656,184.6875 693.0781,183.0313 Q694.4063,181.375 696.9063,181.375 Q697.6094,181.375 698.25,181.5313 Q698.9063,181.6875 699.4688,181.9844 L699.4688,184.7031 Q698.8438,184.125 698.25,183.8594 Q697.6563,183.5781 697.0313,183.5781 Q695.6875,183.5781 695,184.6563 Q694.3125,185.7188 694.3125,187.8125 Q694.3125,189.9063 695,190.9844 Q695.6875,192.0469 697.0313,192.0469 Q697.6563,192.0469 698.25,191.7813 Q698.8438,191.5 699.4688,190.9219 L699.4688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="710.5" y="192.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7s9la8aq6b5k)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3khwxcw63g)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
       <ellipse cx="693.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M696.2188,29.6406 Q695.6406,29.9375 695,30.0781 Q694.3594,30.2344 693.6563,30.2344 Q691.1563,30.2344 689.8281,28.5938 Q688.5156,26.9375 688.5156,23.8125 Q688.5156,20.6875 689.8281,19.0313 Q691.1563,17.375 693.6563,17.375 Q694.3594,17.375 695,17.5313 Q695.6563,17.6875 696.2188,17.9844 L696.2188,20.7031 Q695.5938,20.125 695,19.8594 Q694.4063,19.5781 693.7813,19.5781 Q692.4375,19.5781 691.75,20.6563 Q691.0625,21.7188 691.0625,23.8125 Q691.0625,25.9063 691.75,26.9844 Q692.4375,28.0469 693.7813,28.0469 Q694.4063,28.0469 695,27.7813 Q695.5938,27.5 696.2188,26.9219 L696.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="54"/>
       <ellipse cx="637" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="646" y="62.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="66.8047"/>
       <ellipse cx="637" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="646" y="75.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <path d="M537.5,69.28 C537.5,91.26 537.5,124.76 537.5,151.66 " fill="none" id="C_0000126450862226197239-&gt;C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg
index 0ee71308..12988704 100644
--- a/docs/test_cases/t00034_class_mermaid.svg
+++ b/docs/test_cases/t00034_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 785.19140625 286" style="max-width: 785.191px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 910.58203125 286" style="max-width: 910.582px; background-color: white;" width="910.58203125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -51,39 +51,45 @@
       <g class="clusters"/>
       <g class="edgePaths">
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.9609375,87L71.9609375,96.33333333333333C71.9609375,105.66666666666667,71.9609375,124.33333333333333,71.9609375,143C71.9609375,161.66666666666666,71.9609375,180.33333333333334,71.9609375,189.66666666666666L71.9609375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M374.5736871301775,87L361.6890101084812,96.33333333333333C348.804333086785,105.66666666666667,323.0349790433925,124.33333333333333,310.15030202169623,139.33333333333334C297.265625,154.33333333333334,297.265625,165.66666666666666,297.265625,171.33333333333334L297.265625,177"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M453.2622503698225,87L466.1469273915188,96.33333333333333C479.031604413215,105.66666666666667,504.80095845660753,124.33333333333333,517.6856354783038,143C530.5703125,161.66666666666666,530.5703125,180.33333333333334,530.5703125,189.66666666666666L530.5703125,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M694.75390625,109L694.75390625,114.66666666666667C694.75390625,120.33333333333333,694.75390625,131.66666666666666,694.75390625,146.66666666666666C694.75390625,161.66666666666666,694.75390625,180.33333333333334,694.75390625,189.66666666666666L694.75390625,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M458.04377773668637,87L441.69663769723866,96.33333333333333C425.3494976577909,105.66666666666667,392.6552175788955,124.33333333333333,376.30807753944777,139.33333333333334C359.9609375,154.33333333333334,359.9609375,165.66666666666666,359.9609375,171.33333333333334L359.9609375,177"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M557.8780972633136,87L574.2252373027613,96.33333333333333C590.572377342209,105.66666666666667,623.2666574211045,124.33333333333333,639.6137974605523,143C655.9609375,161.66666666666666,655.9609375,180.33333333333334,655.9609375,189.66666666666666L655.9609375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M820.14453125,109L820.14453125,114.66666666666667C820.14453125,120.33333333333333,820.14453125,131.66666666666666,820.14453125,146.66666666666666C820.14453125,161.66666666666666,820.14453125,180.33333333333334,820.14453125,189.66666666666666L820.14453125,199"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(694.75390625, 143)" class="edgeLabel">
+        <g transform="translate(820.14453125, 143)" class="edgeLabel">
           <g transform="translate(-10.8984375, -9)" class="label">
             <foreignObject height="18" width="21.796875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -96,11 +102,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(297.265625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L9">
+        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L9">
           <g title="Void" id="classId-C_0001704456490210873213-0" class="node default clickable">
-            <rect height="101" width="245.8125" y="-50.5" x="-122.90625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="122.90625" x1="-122.90625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="122.90625" x1="-122.90625" class="divider"/>
+            <rect height="101" width="371.203125" y="-50.5" x="-185.6015625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -112,20 +118,20 @@
                   <span class="nodeLabel">Void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -115.40625, 3)" height="18" width="225.921875">
+              <foreignObject transform="translate( -178.1015625, 3)" height="18" width="351.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator!=(const Void &amp;) : bool</span>
+                  <span class="nodeLabel">+operator!=(const Void &amp;) : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -115.40625, 25)" height="18" width="230.8125">
+              <foreignObject transform="translate( -178.1015625, 25)" height="18" width="356.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator==(const Void &amp;) : bool</span>
+                  <span class="nodeLabel">+operator==(const Void &amp;) : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L16">
+        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L16">
           <g title="lift_void" id="classId-C_0000867472442996685316-1" class="node default clickable">
             <rect height="57" width="104.796875" y="-28.5" x="-52.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.3984375" x1="-52.3984375" class="divider"/>
@@ -144,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L20">
+        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L20">
           <g title="lift_void" id="classId-C_0000126450862226197239-2" class="node default clickable">
             <rect height="57" width="127.921875" y="-28.5" x="-63.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.9609375" x1="-63.9609375" class="divider"/>
@@ -163,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.5703125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L33">
+        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L33">
           <g title="drop_void" id="classId-C_0001578745816100337706-3" class="node default clickable">
             <rect height="57" width="120.796875" y="-28.5" x="-60.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.3984375" x1="-60.3984375" class="divider"/>
@@ -182,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(413.91796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L37">
+        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L37">
           <g title="drop_void" id="classId-C_0001849836134504075115-4" class="node default clickable">
             <rect height="57" width="144.5" y="-28.5" x="-72.25" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.25" x1="-72.25" class="divider"/>
@@ -201,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(694.75390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L43">
+        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L43">
           <g title="A" id="classId-C_0001383912907884688827-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -220,7 +226,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(694.75390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00034/t00034.cc#L45">
+        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00034/t00034.cc#L45">
           <g title="R" id="classId-C_0001713991735741265309-6" class="node default clickable">
             <rect height="101" width="164.875" y="-50.5" x="-82.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="82.4375" x1="-82.4375" class="divider"/>
diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md
index 0c4040c8..0df62c3d 100644
--- a/docs/test_cases/t00035.md
+++ b/docs/test_cases/t00035.md
@@ -162,7 +162,7 @@ struct Right { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index b03c6010..1a94f100 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_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="283px" preserveAspectRatio="none" style="width:280px;height:283px;" version="1.1" viewBox="0 0 280 283" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="feissy45g6yf9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f105oqp7kijte7" 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"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feissy45g6yf9)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f105oqp7kijte7)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
       <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feissy45g6yf9)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f105oqp7kijte7)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" 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="23" x="35" y="136.1543">Left</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feissy45g6yf9)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f105oqp7kijte7)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
       <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feissy45g6yf9)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f105oqp7kijte7)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
       <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feissy45g6yf9)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f105oqp7kijte7)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
       <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg
index 5e2adfee..0780c15d 100644
--- a/docs/test_cases/t00035_class_mermaid.svg
+++ b/docs/test_cases/t00035_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 496.015625 73" style="max-width: 496.016px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 496.015625 73" style="max-width: 496.016px; background-color: white;" width="496.015625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L4">
+        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L4">
           <g title="Top" id="classId-C_0002241062883697294772-0" class="node default clickable">
             <rect height="57" width="43.140625" y="-28.5" x="-21.5703125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="21.5703125" x1="-21.5703125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L6">
+        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L6">
           <g title="Left" id="classId-C_0000242562856080127946-1" class="node default clickable">
             <rect height="57" width="44.328125" y="-28.5" x="-22.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="22.1640625" x1="-22.1640625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L8">
+        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L8">
           <g title="Center" id="classId-C_0001933304541849408421-2" class="node default clickable">
             <rect height="57" width="65.6875" y="-28.5" x="-32.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.84375" x1="-32.84375" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L10">
+        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L10">
           <g title="Bottom" id="classId-C_0001646691079607377420-3" class="node default clickable">
             <rect height="57" width="70.984375" y="-28.5" x="-35.4921875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.4921875" x1="-35.4921875" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00035/t00035.cc#L12">
+        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00035/t00035.cc#L12">
           <g title="Right" id="classId-C_0000200121820090372322-4" class="node default clickable">
             <rect height="57" width="55.875" y="-28.5" x="-27.9375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.9375" x1="-27.9375" class="divider"/>
diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md
index 8054bb95..208897b8 100644
--- a/docs/test_cases/t00036.md
+++ b/docs/test_cases/t00036.md
@@ -278,7 +278,7 @@ struct DImpl : public ns2::ns22::D { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 85c4714d..b2f4c125 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="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1v366j03xnb8x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fa7vl5qi3o1r1" 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"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1v366j03xnb8x)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa7vl5qi3o1r1)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,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(#f1v366j03xnb8x)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa7vl5qi3o1r1)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,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(#f1v366j03xnb8x)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa7vl5qi3o1r1)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,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(#f1v366j03xnb8x)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa7vl5qi3o1r1)" 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(#f1v366j03xnb8x)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa7vl5qi3o1r1)" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v366j03xnb8x)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7vl5qi3o1r1)" height="73.6094" id="C_0002144761953049158478" 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>
@@ -34,8 +34,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v366j03xnb8x)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7vl5qi3o1r1)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
       <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
@@ -44,15 +44,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="452" y2="452"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="458"/>
       <ellipse cx="179" cy="463" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="466.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v366j03xnb8x)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7vl5qi3o1r1)" height="48" id="C_0001832710427462319797" 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>
@@ -61,23 +61,23 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v366j03xnb8x)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7vl5qi3o1r1)" height="60.8047" id="C_0001964031933563607376" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="185.5" y2="185.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="191.5"/>
       <ellipse cx="153" cy="196.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="199.7104">a_int : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v366j03xnb8x)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7vl5qi3o1r1)" height="48" id="C_0002038956882066165590" 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>
diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg
index b72b21b2..4dd7b187 100644
--- a/docs/test_cases/t00036_class_mermaid.svg
+++ b/docs/test_cases/t00036_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 516.703125 393" style="max-width: 516.703px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 514.9375 393" style="max-width: 514.938px; background-color: white;" width="514.9375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,11 +50,11 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M264.15625,109L264.15625,118.33333333333333C264.15625,127.66666666666667,264.15625,146.33333333333334,264.15625,161.33333333333334C264.15625,176.33333333333334,264.15625,187.66666666666666,264.15625,193.33333333333334L264.15625,199"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M264.15625,256L264.15625,260.1666666666667C264.15625,264.3333333333333,264.15625,272.6666666666667,264.15625,281C264.15625,289.3333333333333,264.15625,297.6666666666667,264.15625,301.8333333333333L264.15625,306"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M262.390625,109L262.390625,118.33333333333333C262.390625,127.66666666666667,262.390625,146.33333333333334,262.390625,161.33333333333334C262.390625,176.33333333333334,262.390625,187.66666666666666,262.390625,193.33333333333334L262.390625,199"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M262.390625,256L262.390625,260.1666666666667C262.390625,264.3333333333333,262.390625,272.6666666666667,262.390625,281C262.390625,289.3333333333333,262.390625,297.6666666666667,262.390625,301.8333333333333L262.390625,306"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(264.15625, 165)" class="edgeLabel">
+        <g transform="translate(262.390625, 165)" class="edgeLabel">
           <g transform="translate(-22.0234375, -9)" class="label">
             <foreignObject height="18" width="44.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -65,26 +65,28 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.7578125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L6">
+        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L6">
           <g title="E" id="classId-C_0002144761953049158478-0" class="node default clickable">
-            <rect height="123" width="123.515625" y="-61.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -54)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -24.453125, -32)" height="18" width="48.90625" class="classTitle">
@@ -92,12 +94,12 @@
                   <span class="nodeLabel">ns1::E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 2)" height="18" width="30.25">
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="30.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">blue</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 24)" height="18" width="44.46875">
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">yellow</span>
                 </div>
@@ -105,7 +107,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(264.15625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0000571573305652194946-1" class="node default clickable">
             <rect height="79" width="139.484375" y="-39.5" x="-69.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.7421875" x1="-69.7421875" class="divider"/>
@@ -129,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(264.15625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L16">
+        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L16">
           <g title="B" id="classId-C_0001964031933563607376-2" class="node default clickable">
             <rect height="79" width="165.28125" y="-39.5" x="-82.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="82.640625" x1="-82.640625" class="divider"/>
@@ -153,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(264.15625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0001832710427462319797-3" class="node default clickable">
             <rect height="57" width="149.265625" y="-28.5" x="-74.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6328125" x1="-74.6328125" class="divider"/>
@@ -172,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(452.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00036/t00036.cc#L28">
+        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00036/t00036.cc#L28">
           <g title="C" id="classId-C_0002038956882066165590-4" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md
index 59f1b40a..4b580bd5 100644
--- a/docs/test_cases/t00037.md
+++ b/docs/test_cases/t00037.md
@@ -290,7 +290,7 @@ struct A {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index 4e6a0ac3..6fe47325 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_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="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ainxsgx3fvjx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6lx8ld06tibn" 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"/>
@@ -9,106 +9,106 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ainxsgx3fvjx)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6lx8ld06tibn)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
       <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
       <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_662)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_792)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ainxsgx3fvjx)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6lx8ld06tibn)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
       <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="350" y2="350"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="356"/>
       <ellipse cx="17" cy="361" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="364.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="368.8047"/>
       <ellipse cx="17" cy="373.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="377.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="381.6094"/>
       <ellipse cx="17" cy="386.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="389.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="394.4141"/>
       <ellipse cx="17" cy="399.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="402.6245">z : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ainxsgx3fvjx)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6lx8ld06tibn)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
       <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="362.5" y2="362.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="368.5"/>
       <ellipse cx="188" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="376.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="381.3047"/>
       <ellipse cx="188" cy="386.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="389.5151">h : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ainxsgx3fvjx)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6lx8ld06tibn)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
       <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="131" y="54.2104">A() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="66.8047"/>
       <ellipse cx="122" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="75.0151">st : ST</text>
     </a>
     <path d="M106.32,243.96 C102.05,250.09 98.15,256.5 95,263 C87.97,277.51 83.26,294.41 80.13,309.92 " fill="none" id="C_0000011203041379038775&lt;-C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg
index 6745d65e..cb2f53bc 100644
--- a/docs/test_cases/t00037_class_mermaid.svg
+++ b/docs/test_cases/t00037_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 310.14453125 499" style="max-width: 310.145px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 310.14453125 499" style="max-width: 310.145px; background-color: white;" width="310.14453125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L4">
+        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L4">
           <g title="ST" id="classId-C_0000011203041379038775-0" class="node default clickable">
             <rect height="101" width="275.140625" y="-50.5" x="-137.5703125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="137.5703125" x1="-137.5703125" class="divider"/>
@@ -119,7 +119,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L6">
+        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L6">
           <g title="ST##(dimensions)" id="classId-C_0001980820317972901050-1" class="node default clickable">
             <rect height="145" width="143.890625" y="-72.5" x="-71.9453125" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="71.9453125" x1="-71.9453125" class="divider"/>
@@ -158,7 +158,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L14">
+        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L14">
           <g title="ST##(units)" id="classId-C_0001811145508890403377-2" class="node default clickable">
             <rect height="101" width="94.625" y="-50.5" x="-47.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="47.3125" x1="-47.3125" class="divider"/>
@@ -187,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00037/t00037.cc#L20">
+        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00037/t00037.cc#L20">
           <g title="A" id="classId-C_0001322794181774144954-3" class="node default clickable">
             <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md
index b737a30a..c4f7a113 100644
--- a/docs/test_cases/t00038.md
+++ b/docs/test_cases/t00038.md
@@ -496,7 +496,7 @@ struct map<std::map<key_t,
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index bb2f27b1..b1dcf1d1 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="fsxyplclm37rx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fh2jbiuey069r" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="86.4141" id="C_0000566782399856868761" 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>
@@ -20,16 +20,16 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0001642222718760881014" 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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="86.4141" id="C_0000007376951310260829" 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>
@@ -39,47 +39,47 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0000790040432414172612" 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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0001295970068907562690" 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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0000154510361779680983" 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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="60.8047" id="C_0000137163683637529037" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="268.5" y2="268.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="276.5" y2="276.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1852" y="282.5"/>
       <ellipse cx="1857" cy="287.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1866" y="290.7104">key : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0001917560728132448300" 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>
@@ -88,8 +88,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0001664022047310891203" 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>
@@ -98,8 +98,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0000307700801045535833" 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>
@@ -108,8 +108,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0000548231528417484191" 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>
@@ -118,8 +118,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsxyplclm37rx)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh2jbiuey069r)" height="48" id="C_0001510200402118706005" 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>
diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg
index c16735f7..a430a1cc 100644
--- a/docs/test_cases/t00038_class_mermaid.svg
+++ b/docs/test_cases/t00038_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2676.328125 375" style="max-width: 2676.33px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2676.328125 375" style="max-width: 2676.33px; background-color: white;" width="2676.328125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -51,25 +51,38 @@
       <g class="clusters"/>
       <g class="edgePaths">
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M326.21977219626166,172L325.4409559968847,176.16666666666666C324.6621397975078,180.33333333333334,323.10450739875387,188.66666666666666,322.32569119937693,197C321.546875,205.33333333333334,321.546875,213.66666666666666,321.546875,217.83333333333334L321.546875,222"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.8874488901869,172L571.4927959501557,176.16666666666666C602.0981430101245,180.33333333333334,663.3088371300623,188.66666666666666,703.5938115938774,204.33333333333334C743.8787860576923,220,763.2380408653847,243,772.9176682692308,254.5L782.5972956730769,266"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.6523072429907,172L571.2232768691589,176.16666666666666C601.7942464953271,180.33333333333334,662.9361857476636,188.66666666666666,703.1867827776779,204.33333333333334C743.4373798076923,220,762.7966346153847,243,772.4762620192308,254.5L782.1558894230769,266"/>
         <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M331.546875,65L331.546875,69.16666666666667C331.546875,73.33333333333333,331.546875,81.66666666666667,331.546875,90C331.546875,98.33333333333333,331.546875,106.66666666666667,331.546875,110.83333333333333L331.546875,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1654.1438802083333,205.9484003169556C1811.1627604166667,226.03847708486316,1983.8567708333333,255.0769541697263,2070.2037760416665,269.5961927121579L2156.55078125,284.11543125458945"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M845.1018180490654,172L828.3381035825545,176.16666666666666C811.5743891160437,180.33333333333334,778.0469601830218,188.66666666666666,768.6038987613828,204.33333333333334C759.1608373397436,220,773.8021434294873,243,781.1227964743589,254.5L788.4434495192307,266"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1654.3645833333333,205.9744388492184C1811.6041666666667,226.0905541493888,1984.7395833333333,255.18110829877753,2071.3072916666665,269.72638537347194L2157.875,284.2716624481663"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M844.8666764018692,172L828.0685845015577,176.16666666666666C811.2704926012461,180.33333333333334,777.674308800623,188.66666666666666,768.1968699451833,204.33333333333334C758.7194310897436,220,773.3607371794873,243,780.6813902243589,254.5L788.0020432692307,266"/>
         <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M959.765625,65L959.765625,69.16666666666667C959.765625,73.33333333333333,959.765625,81.66666666666667,959.765625,90C959.765625,98.33333333333333,959.765625,106.66666666666667,959.765625,110.83333333333333L959.765625,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.8634637850466,172L1840.3133031542056,176.16666666666666C1874.7631425233642,180.33333333333334,1943.6628212616822,188.66666666666666,2002.110707505841,204.20564921873518C2060.55859375,219.7446317708037,2108.5546875,242.48926354160733,2132.552734375,253.86157942700916L2156.55078125,265.233895312411"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.3538624415887,172L1296.430953076324,176.16666666666666C1261.5080437110591,180.33333333333334,1191.6622249805296,188.66666666666666,1110.5641854069315,207.11518626831392C1029.4661458333333,225.56370586996118,937.1158854166666,254.12741173992242,890.9407552083334,268.409264674903L844.765625,282.69111760988363"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.6283221378505,172L1840.0437840732086,176.16666666666666C1874.459246008567,180.33333333333334,1943.2901698792837,188.66666666666666,2001.9979495229752,204.29591627754567C2060.7057291666665,219.9251658884247,2109.2903645833335,242.85033177684934,2133.5826822916665,254.3129147210617L2157.875,265.77549766527403"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.1187207943926,172L1296.1614339953273,176.16666666666666C1261.2041471962618,180.33333333333334,1191.2895735981308,188.66666666666666,1110.1571565907323,207.11518626831392C1029.0247395833333,225.56370586996118,936.6744791666666,254.12741173992242,890.4993489583334,268.409264674903L844.32421875,282.69111760988363"/>
         <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1570.2265625,65L1570.2265625,69.16666666666667C1570.2265625,73.33333333333333,1570.2265625,81.66666666666667,1570.2265625,90C1570.2265625,98.33333333333333,1570.2265625,106.66666666666667,1570.2265625,110.83333333333333L1570.2265625,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.502847546729,172L2417.902112538941,176.16666666666666C2433.3013775311524,180.33333333333334,2464.0999075155764,188.66666666666666,2479.4991725077884,202.5C2494.8984375,216.33333333333334,2494.8984375,235.66666666666666,2494.8984375,245.33333333333334L2494.8984375,255"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2293.8016493055557,197C2290.4314236111113,205.33333333333334,2283.690972222222,213.66666666666666,2280.320746527778,217.83333333333334L2276.9505208333335,222"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1399.4140625,207.0144223900086C1219.2057291666667,227.4313814234268,1031.9856770833333,257.8627628468536,938.3756510416666,273.07845355856705L844.765625,288.29414427028047"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.0325642523367,172L2417.363074376947,176.16666666666666C2432.693584501558,180.33333333333334,2463.354604750779,188.66666666666666,2478.6851148753894,202.5C2494.015625,216.33333333333334,2494.015625,235.66666666666666,2494.015625,245.33333333333334L2494.015625,255"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2293.820512820513,197C2290.469150641026,205.33333333333334,2283.7664262820513,213.66666666666666,2280.4150641025644,217.83333333333334L2277.063701923077,222"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1399.3404947916667,207.0151829511361C1219.05859375,227.4329025456817,1031.69140625,257.8658050913634,938.0078125,273.0822563642043L844.32421875,288.29870763704514"/>
         <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M2297.171875,65L2297.171875,69.16666666666667C2297.171875,73.33333333333333,2297.171875,81.66666666666667,2297.171875,90C2297.171875,98.33333333333333,2297.171875,106.66666666666667,2297.171875,110.83333333333333L2297.171875,115"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -83,11 +96,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -101,11 +127,24 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -119,56 +158,35 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -184,15 +202,15 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L8">
+        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L8">
           <g title="color_t" id="classId-C_0000566782399856868761-0" class="node default clickable">
             <rect height="145" width="191.90625" y="-72.5" x="-95.953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="95.953125" x1="-95.953125" class="divider"/>
             <line y2="61.5" y1="61.5" x2="95.953125" x1="-95.953125" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -88.453125, -43)" height="18" width="176.90625" class="classTitle">
@@ -218,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L10">
+        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L10">
           <g title="E" id="classId-C_0001642222718760881014-1" class="node default clickable">
             <rect height="57" width="149.234375" y="-28.5" x="-74.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6171875" x1="-74.6171875" class="divider"/>
@@ -237,15 +255,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2218.30859375, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L20">
+        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L20">
           <g title="property_t" id="classId-C_0000007376951310260829-2" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -39.5625, -43)" height="18" width="79.125" class="classTitle">
@@ -253,17 +271,17 @@
                   <span class="nodeLabel">property_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="76.5">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="76.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">property_a</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="76.5">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="76.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">property_b</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="75.59375">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="75.59375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">property_c</span>
                 </div>
@@ -271,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L22">
+        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L22">
           <g title="A" id="classId-C_0000790040432414172612-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -290,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L23">
+        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L23">
           <g title="B" id="classId-C_0001295970068907562690-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -309,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L24">
+        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L24">
           <g title="C" id="classId-C_0000154510361779680983-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -328,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2494.8984375, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L26">
+        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L26">
           <g title="key_t" id="classId-C_0000137163683637529037-6" class="node default clickable">
             <rect height="79" width="131.9375" y="-39.5" x="-65.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.96875" x1="-65.96875" class="divider"/>
@@ -352,7 +370,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.5859375, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L30">
+        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L30">
           <g title="map" id="classId-C_0001917560728132448300-7" class="node default clickable">
             <rect height="57" width="76.359375" y="-28.5" x="-38.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.1796875" x1="-38.1796875" class="divider"/>
@@ -371,7 +389,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L34">
+        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L34">
           <g title="map" id="classId-C_0001664022047310891203-8" class="node default clickable">
             <rect height="57" width="647.09375" y="-28.5" x="-323.546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="323.546875" x1="-323.546875" class="divider"/>
@@ -390,7 +408,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L37">
+        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L37">
           <g title="map" id="classId-C_0000307700801045535833-9" class="node default clickable">
             <rect height="57" width="509.34375" y="-28.5" x="-254.671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="254.671875" x1="-254.671875" class="divider"/>
@@ -409,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L41">
+        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L41">
           <g title="map" id="classId-C_0000548231528417484191-10" class="node default clickable">
             <rect height="57" width="611.578125" y="-28.5" x="-305.7890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="305.7890625" x1="-305.7890625" class="divider"/>
@@ -428,7 +446,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00038/t00038.cc#L46">
+        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00038/t00038.cc#L46">
           <g title="map" id="classId-C_0001510200402118706005-11" class="node default clickable">
             <rect height="57" width="742.3125" y="-28.5" x="-371.15625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="371.15625" x1="-371.15625" class="divider"/>
diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md
index f3ae6844..e37cc93b 100644
--- a/docs/test_cases/t00039.md
+++ b/docs/test_cases/t00039.md
@@ -610,7 +610,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index 490837fd..f95056d5 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_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="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="foa96i611i1zi" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f9jxd8ts0vzsa" 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"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
       <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
       <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
       <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
       <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
       <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
       <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
       <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
       <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
       <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="296"/>
       <ellipse cx="270" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="304.2104">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
       <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
       <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
@@ -106,15 +106,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="54"/>
       <ellipse cx="458" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="62.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
       <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
@@ -123,15 +123,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="175"/>
       <ellipse cx="378.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
       <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
@@ -140,15 +140,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="175"/>
       <ellipse cx="516" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foa96i611i1zi)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9jxd8ts0vzsa)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
       <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
@@ -157,11 +157,11 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="296"/>
       <ellipse cx="368.5" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="304.2104">n : N *</text>
     </a>
     <path d="M34.31,82.88 C33.42,100.62 32.42,120.44 31.67,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg
index 2d38e266..cc4df4b8 100644
--- a/docs/test_cases/t00039_class_mermaid.svg
+++ b/docs/test_cases/t00039_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 689.1796875 460" style="max-width: 689.18px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 689.1796875 460" style="max-width: 689.18px; background-color: white;" width="689.1796875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -184,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L6">
+        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L6">
           <g title="C" id="classId-C_0000241234977032861936-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L8">
+        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L8">
           <g title="D" id="classId-C_0001975187139659616784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L10">
+        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L10">
           <g title="E" id="classId-C_0001959131184346890363-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L16">
+        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L16">
           <g title="CD" id="classId-C_0000850483622527996929-3" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L18">
+        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L18">
           <g title="DE" id="classId-C_0001316022308303681160-4" class="node default clickable">
             <rect height="57" width="37.234375" y="-28.5" x="-18.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.6171875" x1="-18.6171875" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L20">
+        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L20">
           <g title="CDE" id="classId-C_0001877487144594774465-5" class="node default clickable">
             <rect height="57" width="48.78125" y="-28.5" x="-24.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.390625" x1="-24.390625" class="divider"/>
@@ -298,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L22">
+        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L22">
           <g title="A" id="classId-C_0001051171525946759825-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -317,7 +317,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L24">
+        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L24">
           <g title="AA" id="classId-C_0001761969273600680013-7" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -336,7 +336,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L26">
+        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L26">
           <g title="AAA" id="classId-C_0002158483243842147804-8" class="node default clickable">
             <rect height="79" width="57.25" y="-39.5" x="-28.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.625" x1="-28.625" class="divider"/>
@@ -360,7 +360,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L31">
+        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L31">
           <g title="AAAA" id="classId-C_0001857294881176816154-9" class="node default clickable">
             <rect height="57" width="99.453125" y="-28.5" x="-49.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="49.7265625" x1="-49.7265625" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L39">
+        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L39">
           <g title="F" id="classId-C_0000955785395599769805-10" class="node default clickable">
             <rect height="79" width="91.46875" y="-39.5" x="-45.734375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="45.734375" x1="-45.734375" class="divider"/>
@@ -403,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L43">
+        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L43">
           <g title="FF" id="classId-C_0001321996888067531304-11" class="node default clickable">
             <rect height="79" width="117.234375" y="-39.5" x="-58.6171875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -427,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L47">
+        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L47">
           <g title="FE" id="classId-C_0002008055732881129924-12" class="node default clickable">
             <rect height="79" width="118.140625" y="-39.5" x="-59.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.0703125" x1="-59.0703125" class="divider"/>
@@ -451,7 +451,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00039/t00039.cc#L51">
+        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00039/t00039.cc#L51">
           <g title="FFF" id="classId-C_0001617455840736919039-13" class="node default clickable">
             <rect height="79" width="143.015625" y="-39.5" x="-71.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.5078125" x1="-71.5078125" class="divider"/>
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md
index b2d9a0bf..416292a4 100644
--- a/docs/test_cases/t00040.md
+++ b/docs/test_cases/t00040.md
@@ -309,7 +309,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index c4bdb854..96267ab6 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_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="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1p71rg9psh4js" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1odukiyp3l8xg" 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"/>
@@ -9,70 +9,70 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p71rg9psh4js)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odukiyp3l8xg)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
       <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <ellipse cx="24" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="54.2104">get_a() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="66.8047"/>
       <polygon fill="none" points="24,66.8047,28,70.8047,24,74.8047,20,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="75.0151">ii_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p71rg9psh4js)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odukiyp3l8xg)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
       <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p71rg9psh4js)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odukiyp3l8xg)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
       <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
       <ellipse cx="17" cy="293" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="296.2104">get_aaa() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="308.8047"/>
       <ellipse cx="17" cy="313.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="317.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p71rg9psh4js)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odukiyp3l8xg)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
       <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="46.5" y2="46.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="145" y="52.5"/>
       <ellipse cx="150" cy="57.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="159" y="60.7104">foo(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="67.3047" y2="67.3047"/>
diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg
index c16b95c9..1ca732d6 100644
--- a/docs/test_cases/t00040_class_mermaid.svg
+++ b/docs/test_cases/t00040_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 313.9140625 375" style="max-width: 313.914px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 313.9140625 375" style="max-width: 313.914px; background-color: white;" width="313.9140625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L5">
+        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L5">
           <g title="A" id="classId-C_0000307580006083737677-0" class="node default clickable">
             <rect height="101" width="105.28125" y="-50.5" x="-52.640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.640625" x1="-52.640625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L18">
+        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L18">
           <g title="AA" id="classId-C_0000534115812779766127-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L22">
+        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L22">
           <g title="AAA" id="classId-C_0000745371908432158369-2" class="node default clickable">
             <rect height="101" width="123.078125" y="-50.5" x="-61.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
@@ -151,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00040/t00040.cc#L31">
+        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00040/t00040.cc#L31">
           <g title="R" id="classId-C_0001539035020975101539-3" class="node default clickable">
             <rect height="79" width="133.734375" y="-39.5" x="-66.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md
index 511928bd..35b88937 100644
--- a/docs/test_cases/t00041.md
+++ b/docs/test_cases/t00041.md
@@ -392,7 +392,7 @@ struct NM : public N { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index d06dbaa4..c0bc19c3 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_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="381px" preserveAspectRatio="none" style="width:427px;height:381px;" version="1.1" viewBox="0 0 427 381" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bpfmy42ztatn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwlj0xda0a3c3" 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"/>
@@ -9,107 +9,107 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
       <ellipse cx="72" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M74.9688,36.1406 Q74.3906,36.4375 73.75,36.5781 Q73.1094,36.7344 72.4063,36.7344 Q69.9063,36.7344 68.5781,35.0938 Q67.2656,33.4375 67.2656,30.3125 Q67.2656,27.1875 68.5781,25.5313 Q69.9063,23.875 72.4063,23.875 Q73.1094,23.875 73.75,24.0313 Q74.4063,24.1875 74.9688,24.4844 L74.9688,27.2031 Q74.3438,26.625 73.75,26.3594 Q73.1563,26.0781 72.5313,26.0781 Q71.1875,26.0781 70.5,27.1563 Q69.8125,28.2188 69.8125,30.3125 Q69.8125,32.4063 70.5,33.4844 Q71.1875,34.5469 72.5313,34.5469 Q73.1563,34.5469 73.75,34.2813 Q74.3438,34 74.9688,33.4219 L74.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="86" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
       <ellipse cx="160.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.9188,29.6406 Q163.3406,29.9375 162.7,30.0781 Q162.0594,30.2344 161.3563,30.2344 Q158.8563,30.2344 157.5281,28.5938 Q156.2156,26.9375 156.2156,23.8125 Q156.2156,20.6875 157.5281,19.0313 Q158.8563,17.375 161.3563,17.375 Q162.0594,17.375 162.7,17.5313 Q163.3563,17.6875 163.9188,17.9844 L163.9188,20.7031 Q163.2938,20.125 162.7,19.8594 Q162.1063,19.5781 161.4813,19.5781 Q160.1375,19.5781 159.45,20.6563 Q158.7625,21.7188 158.7625,23.8125 Q158.7625,25.9063 159.45,26.9844 Q160.1375,28.0469 161.4813,28.0469 Q162.1063,28.0469 162.7,27.7813 Q163.2938,27.5 163.9188,26.9219 L163.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="178.05" y="28.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="54"/>
       <ellipse cx="143" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="152" y="62.2104">rr : RR *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
       <ellipse cx="21" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,343.6406 Q23.3906,343.9375 22.75,344.0781 Q22.1094,344.2344 21.4063,344.2344 Q18.9063,344.2344 17.5781,342.5938 Q16.2656,340.9375 16.2656,337.8125 Q16.2656,334.6875 17.5781,333.0313 Q18.9063,331.375 21.4063,331.375 Q22.1094,331.375 22.75,331.5313 Q23.4063,331.6875 23.9688,331.9844 L23.9688,334.7031 Q23.3438,334.125 22.75,333.8594 Q22.1563,333.5781 21.5313,333.5781 Q20.1875,333.5781 19.5,334.6563 Q18.8125,335.7188 18.8125,337.8125 Q18.8125,339.9063 19.5,340.9844 Q20.1875,342.0469 21.5313,342.0469 Q22.1563,342.0469 22.75,341.7813 Q23.3438,341.5 23.9688,340.9219 L23.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="342.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
       <ellipse cx="96.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,343.6406 Q98.8906,343.9375 98.25,344.0781 Q97.6094,344.2344 96.9063,344.2344 Q94.4063,344.2344 93.0781,342.5938 Q91.7656,340.9375 91.7656,337.8125 Q91.7656,334.6875 93.0781,333.0313 Q94.4063,331.375 96.9063,331.375 Q97.6094,331.375 98.25,331.5313 Q98.9063,331.6875 99.4688,331.9844 L99.4688,334.7031 Q98.8438,334.125 98.25,333.8594 Q97.6563,333.5781 97.0313,333.5781 Q95.6875,333.5781 95,334.6563 Q94.3125,335.7188 94.3125,337.8125 Q94.3125,339.9063 95,340.9844 Q95.6875,342.0469 97.0313,342.0469 Q97.6563,342.0469 98.25,341.7813 Q98.8438,341.5 99.4688,340.9219 L99.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="342.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
       <ellipse cx="88.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M91.7188,167.6406 Q91.1406,167.9375 90.5,168.0781 Q89.8594,168.2344 89.1563,168.2344 Q86.6563,168.2344 85.3281,166.5938 Q84.0156,164.9375 84.0156,161.8125 Q84.0156,158.6875 85.3281,157.0313 Q86.6563,155.375 89.1563,155.375 Q89.8594,155.375 90.5,155.5313 Q91.1563,155.6875 91.7188,155.9844 L91.7188,158.7031 Q91.0938,158.125 90.5,157.8594 Q89.9063,157.5781 89.2813,157.5781 Q87.9375,157.5781 87.25,158.6563 Q86.5625,159.7188 86.5625,161.8125 Q86.5625,163.9063 87.25,164.9844 Q87.9375,166.0469 89.2813,166.0469 Q89.9063,166.0469 90.5,165.7813 Q91.0938,165.5 91.7188,164.9219 L91.7188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="109.25" y="166.1543">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="184"/>
       <ellipse cx="54" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="192.2104">foo(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="204.8047"/>
       <ellipse cx="54" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="63" y="213.0151">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="217.6094"/>
       <ellipse cx="54" cy="222.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="63" y="225.8198">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="230.4141"/>
       <ellipse cx="54" cy="235.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="63" y="238.6245">g : detail::G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
       <ellipse cx="171" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,343.6406 Q173.3906,343.9375 172.75,344.0781 Q172.1094,344.2344 171.4063,344.2344 Q168.9063,344.2344 167.5781,342.5938 Q166.2656,340.9375 166.2656,337.8125 Q166.2656,334.6875 167.5781,333.0313 Q168.9063,331.375 171.4063,331.375 Q172.1094,331.375 172.75,331.5313 Q173.4063,331.6875 173.9688,331.9844 L173.9688,334.7031 Q173.3438,334.125 172.75,333.8594 Q172.1563,333.5781 171.5313,333.5781 Q170.1875,333.5781 169.5,334.6563 Q168.8125,335.7188 168.8125,337.8125 Q168.8125,339.9063 169.5,340.9844 Q170.1875,342.0469 171.5313,342.0469 Q172.1563,342.0469 172.75,341.7813 Q173.3438,341.5 173.9688,340.9219 L173.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="342.1543">RRR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
       <ellipse cx="304" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M306.9688,36.1406 Q306.3906,36.4375 305.75,36.5781 Q305.1094,36.7344 304.4063,36.7344 Q301.9063,36.7344 300.5781,35.0938 Q299.2656,33.4375 299.2656,30.3125 Q299.2656,27.1875 300.5781,25.5313 Q301.9063,23.875 304.4063,23.875 Q305.1094,23.875 305.75,24.0313 Q306.4063,24.1875 306.9688,24.4844 L306.9688,27.2031 Q306.3438,26.625 305.75,26.3594 Q305.1563,26.0781 304.5313,26.0781 Q303.1875,26.0781 302.5,27.1563 Q301.8125,28.2188 301.8125,30.3125 Q301.8125,32.4063 302.5,33.4844 Q303.1875,34.5469 304.5313,34.5469 Q305.1563,34.5469 305.75,34.2813 Q306.3438,34 306.9688,33.4219 L306.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="318" y="34.6543">ns1::N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
       <ellipse cx="232.5" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.4688,193.1406 Q234.8906,193.4375 234.25,193.5781 Q233.6094,193.7344 232.9063,193.7344 Q230.4063,193.7344 229.0781,192.0938 Q227.7656,190.4375 227.7656,187.3125 Q227.7656,184.1875 229.0781,182.5313 Q230.4063,180.875 232.9063,180.875 Q233.6094,180.875 234.25,181.0313 Q234.9063,181.1875 235.4688,181.4844 L235.4688,184.2031 Q234.8438,183.625 234.25,183.3594 Q233.6563,183.0781 233.0313,183.0781 Q231.6875,183.0781 231,184.1563 Q230.3125,185.2188 230.3125,187.3125 Q230.3125,189.4063 231,190.4844 Q231.6875,191.5469 233.0313,191.5469 Q233.6563,191.5469 234.25,191.2813 Q234.8438,191 235.4688,190.4219 L235.4688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="246.5" y="191.6543">ns1::NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="203.5" y2="203.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="211.5" y2="211.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bpfmy42ztatn)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwlj0xda0a3c3)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
       <ellipse cx="349" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.9688,193.1406 Q351.3906,193.4375 350.75,193.5781 Q350.1094,193.7344 349.4063,193.7344 Q346.9063,193.7344 345.5781,192.0938 Q344.2656,190.4375 344.2656,187.3125 Q344.2656,184.1875 345.5781,182.5313 Q346.9063,180.875 349.4063,180.875 Q350.1094,180.875 350.75,181.0313 Q351.4063,181.1875 351.9688,181.4844 L351.9688,184.2031 Q351.3438,183.625 350.75,183.3594 Q350.1563,183.0781 349.5313,183.0781 Q348.1875,183.0781 347.5,184.1563 Q346.8125,185.2188 346.8125,187.3125 Q346.8125,189.4063 347.5,190.4844 Q348.1875,191.5469 349.5313,191.5469 Q350.1563,191.5469 350.75,191.2813 Q351.3438,191 351.9688,190.4219 L351.9688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="363" y="191.6543">ns1::NM</text>
diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg
index 63ec4462..65234735 100644
--- a/docs/test_cases/t00041_class_mermaid.svg
+++ b/docs/test_cases/t00041_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 442.8125 433" style="max-width: 442.812px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 442.8125 433" style="max-width: 442.812px; background-color: white;" width="442.8125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -130,7 +130,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L9">
+        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L9">
           <g title="R" id="classId-C_0000775317088453163919-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L13">
+        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L13">
           <g title="D" id="classId-C_0001798851434286108347-1" class="node default clickable">
             <rect height="79" width="71.453125" y="-39.5" x="-35.7265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.7265625" x1="-35.7265625" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L17">
+        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L17">
           <g title="E" id="classId-C_0002158730167547707264-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L19">
+        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L19">
           <g title="F" id="classId-C_0000430600213408545846-3" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L27">
+        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L27">
           <g title="RR" id="classId-C_0000175608867682236642-4" class="node default clickable">
             <rect height="145" width="135.5" y="-72.5" x="-67.75" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="67.75" x1="-67.75" class="divider"/>
@@ -250,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L35">
+        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L35">
           <g title="RRR" id="classId-C_0000819254010294444715-5" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -269,7 +269,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L38">
+        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L38">
           <g title="N" id="classId-C_0000220253364661036147-6" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -288,7 +288,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L40">
+        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L40">
           <g title="NN" id="classId-C_0000618038667214398895-7" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -307,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00041/t00041.cc#L42">
+        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00041/t00041.cc#L42">
           <g title="NM" id="classId-C_0001206750351408617127-8" class="node default clickable">
             <rect height="57" width="78.109375" y="-28.5" x="-39.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.0546875" x1="-39.0546875" class="divider"/>
diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md
index 41fa0615..dfa41457 100644
--- a/docs/test_cases/t00042.md
+++ b/docs/test_cases/t00042.md
@@ -307,7 +307,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index dfe01169..27433162 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_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="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbszpdq52qsrf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fh1saqcjuo537" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
       <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="181.5"/>
       <ellipse cx="148" cy="186.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="189.7104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
       <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="62.2104">a : void *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
       <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
@@ -53,22 +53,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="175"/>
       <ellipse cx="408.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="183.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="187.8047"/>
       <ellipse cx="408.5" cy="192.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="196.0151">bb : K</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
       <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
@@ -77,8 +77,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
       <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbszpdq52qsrf)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh1saqcjuo537)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
       <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg
index ecf5cddb..ec8ff8b4 100644
--- a/docs/test_cases/t00042_class_mermaid.svg
+++ b/docs/test_cases/t00042_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 569.1875 246" style="max-width: 569.188px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 569.1875 246" style="max-width: 569.188px; background-color: white;" width="569.1875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -56,45 +56,53 @@
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M509.6796875,76L509.6796875,82C509.6796875,88,509.6796875,100,509.6796875,110.16666666666667C509.6796875,120.33333333333333,509.6796875,128.66666666666666,509.6796875,132.83333333333334L509.6796875,137"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000462160951579835462-0" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -118,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L9">
+        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L9">
           <g title="A" id="classId-C_0001422802342059669545-1" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -142,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001414456934388678010-2" class="node default clickable">
             <rect height="101" width="69.25" y="-50.5" x="-34.625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.625" x1="-34.625" class="divider"/>
@@ -171,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000364538479078826988-3" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -190,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L5">
+        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000496773262538580186-4" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -209,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001833471931530161359-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md
index f4b1a46d..06312776 100644
--- a/docs/test_cases/t00043.md
+++ b/docs/test_cases/t00043.md
@@ -653,7 +653,7 @@ struct J {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 1304ac9b..0fb770da 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_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="645px" preserveAspectRatio="none" style="width:512px;height:645px;" version="1.1" viewBox="0 0 512 645" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17rlydk6ygm6o" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fugxi0b1fchwk" 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"/>
@@ -9,167 +9,167 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f17rlydk6ygm6o)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fugxi0b1fchwk)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f17rlydk6ygm6o)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fugxi0b1fchwk)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="328" x2="453" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="332" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
       <ellipse cx="159" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.9688,590.6406 Q161.3906,590.9375 160.75,591.0781 Q160.1094,591.2344 159.4063,591.2344 Q156.9063,591.2344 155.5781,589.5938 Q154.2656,587.9375 154.2656,584.8125 Q154.2656,581.6875 155.5781,580.0313 Q156.9063,578.375 159.4063,578.375 Q160.1094,578.375 160.75,578.5313 Q161.4063,578.6875 161.9688,578.9844 L161.9688,581.7031 Q161.3438,581.125 160.75,580.8594 Q160.1563,580.5781 159.5313,580.5781 Q158.1875,580.5781 157.5,581.6563 Q156.8125,582.7188 156.8125,584.8125 Q156.8125,586.9063 157.5,587.9844 Q158.1875,589.0469 159.5313,589.0469 Q160.1563,589.0469 160.75,588.7813 Q161.3438,588.5 161.9688,587.9219 L161.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="173" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
       <ellipse cx="227.8" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.7688,469.6406 Q230.1906,469.9375 229.55,470.0781 Q228.9094,470.2344 228.2063,470.2344 Q225.7063,470.2344 224.3781,468.5938 Q223.0656,466.9375 223.0656,463.8125 Q223.0656,460.6875 224.3781,459.0313 Q225.7063,457.375 228.2063,457.375 Q228.9094,457.375 229.55,457.5313 Q230.2063,457.6875 230.7688,457.9844 L230.7688,460.7031 Q230.1438,460.125 229.55,459.8594 Q228.9563,459.5781 228.3313,459.5781 Q226.9875,459.5781 226.3,460.6563 Q225.6125,461.7188 225.6125,463.8125 Q225.6125,465.9063 226.3,466.9844 Q226.9875,468.0469 228.3313,468.0469 Q228.9563,468.0469 229.55,467.7813 Q230.1438,467.5 230.7688,466.9219 L230.7688,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="248.2" y="468.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="190" y="486"/>
       <ellipse cx="195" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="204" y="494.2104">b(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
       <ellipse cx="80.85" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M83.8188,469.6406 Q83.2406,469.9375 82.6,470.0781 Q81.9594,470.2344 81.2563,470.2344 Q78.7563,470.2344 77.4281,468.5938 Q76.1156,466.9375 76.1156,463.8125 Q76.1156,460.6875 77.4281,459.0313 Q78.7563,457.375 81.2563,457.375 Q81.9594,457.375 82.6,457.5313 Q83.2563,457.6875 83.8188,457.9844 L83.8188,460.7031 Q83.1938,460.125 82.6,459.8594 Q82.0063,459.5781 81.3813,459.5781 Q80.0375,459.5781 79.35,460.6563 Q78.6625,461.7188 78.6625,463.8125 Q78.6625,465.9063 79.35,466.9844 Q80.0375,468.0469 81.3813,468.0469 Q82.0063,468.0469 82.6,467.7813 Q83.1938,467.5 83.8188,466.9219 L83.8188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="101.15" y="468.1543">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="43.5" y="486"/>
       <ellipse cx="48.5" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="57.5" y="494.2104">bb(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
       <ellipse cx="213.8" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M216.7688,342.1406 Q216.1906,342.4375 215.55,342.5781 Q214.9094,342.7344 214.2063,342.7344 Q211.7063,342.7344 210.3781,341.0938 Q209.0656,339.4375 209.0656,336.3125 Q209.0656,333.1875 210.3781,331.5313 Q211.7063,329.875 214.2063,329.875 Q214.9094,329.875 215.55,330.0313 Q216.2063,330.1875 216.7688,330.4844 L216.7688,333.2031 Q216.1438,332.625 215.55,332.3594 Q214.9563,332.0781 214.3313,332.0781 Q212.9875,332.0781 212.3,333.1563 Q211.6125,334.2188 211.6125,336.3125 Q211.6125,338.4063 212.3,339.4844 Q212.9875,340.5469 214.3313,340.5469 Q214.9563,340.5469 215.55,340.2813 Q216.1438,340 216.7688,339.4219 L216.7688,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="234.2" y="340.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="176" y="358.5"/>
       <ellipse cx="181" cy="363.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="190" y="366.7104">c(B * b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="373.3047" y2="373.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
       <ellipse cx="132.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.2188,201.6406 Q134.6406,201.9375 134,202.0781 Q133.3594,202.2344 132.6563,202.2344 Q130.1563,202.2344 128.8281,200.5938 Q127.5156,198.9375 127.5156,195.8125 Q127.5156,192.6875 128.8281,191.0313 Q130.1563,189.375 132.6563,189.375 Q133.3594,189.375 134,189.5313 Q134.6563,189.6875 135.2188,189.9844 L135.2188,192.7031 Q134.5938,192.125 134,191.8594 Q133.4063,191.5781 132.7813,191.5781 Q131.4375,191.5781 130.75,192.6563 Q130.0625,193.7188 130.0625,195.8125 Q130.0625,197.9063 130.75,198.9844 Q131.4375,200.0469 132.7813,200.0469 Q133.4063,200.0469 134,199.7813 Q134.5938,199.5 135.2188,198.9219 L135.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="152.75" y="200.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="218"/>
       <ellipse cx="88.5" cy="223" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="97.5" y="226.2104">d(C * c) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="230.8047"/>
       <ellipse cx="88.5" cy="235.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="97.5" y="239.0151">dd(BB * bb) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="245.6094" y2="245.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
       <ellipse cx="132.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.7188,80.6406 Q135.1406,80.9375 134.5,81.0781 Q133.8594,81.2344 133.1563,81.2344 Q130.6563,81.2344 129.3281,79.5938 Q128.0156,77.9375 128.0156,74.8125 Q128.0156,71.6875 129.3281,70.0313 Q130.6563,68.375 133.1563,68.375 Q133.8594,68.375 134.5,68.5313 Q135.1563,68.6875 135.7188,68.9844 L135.7188,71.7031 Q135.0938,71.125 134.5,70.8594 Q133.9063,70.5781 133.2813,70.5781 Q131.9375,70.5781 131.25,71.6563 Q130.5625,72.7188 130.5625,74.8125 Q130.5625,76.9063 131.25,77.9844 Q131.9375,79.0469 133.2813,79.0469 Q133.9063,79.0469 134.5,78.7813 Q135.0938,78.5 135.7188,77.9219 L135.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="153.25" y="79.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="94.5" y="97"/>
       <ellipse cx="99.5" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="108.5" y="105.2104">e(D * d) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="111.8047" y2="111.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
       <ellipse cx="360.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.4688,476.1406 Q362.8906,476.4375 362.25,476.5781 Q361.6094,476.7344 360.9063,476.7344 Q358.4063,476.7344 357.0781,475.0938 Q355.7656,473.4375 355.7656,470.3125 Q355.7656,467.1875 357.0781,465.5313 Q358.4063,463.875 360.9063,463.875 Q361.6094,463.875 362.25,464.0313 Q362.9063,464.1875 363.4688,464.4844 L363.4688,467.2031 Q362.8438,466.625 362.25,466.3594 Q361.6563,466.0781 361.0313,466.0781 Q359.6875,466.0781 359,467.1563 Q358.3125,468.2188 358.3125,470.3125 Q358.3125,472.4063 359,473.4844 Q359.6875,474.5469 361.0313,474.5469 Q361.6563,474.5469 362.25,474.2813 Q362.8438,474 363.4688,473.4219 L363.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="374.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
       <ellipse cx="437" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M439.9688,476.1406 Q439.3906,476.4375 438.75,476.5781 Q438.1094,476.7344 437.4063,476.7344 Q434.9063,476.7344 433.5781,475.0938 Q432.2656,473.4375 432.2656,470.3125 Q432.2656,467.1875 433.5781,465.5313 Q434.9063,463.875 437.4063,463.875 Q438.1094,463.875 438.75,464.0313 Q439.4063,464.1875 439.9688,464.4844 L439.9688,467.2031 Q439.3438,466.625 438.75,466.3594 Q438.1563,466.0781 437.5313,466.0781 Q436.1875,466.0781 435.5,467.1563 Q434.8125,468.2188 434.8125,470.3125 Q434.8125,472.4063 435.5,473.4844 Q436.1875,474.5469 437.5313,474.5469 Q438.1563,474.5469 438.75,474.2813 Q439.3438,474 439.9688,473.4219 L439.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="451" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
       <ellipse cx="400.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M403.2188,335.6406 Q402.6406,335.9375 402,336.0781 Q401.3594,336.2344 400.6563,336.2344 Q398.1563,336.2344 396.8281,334.5938 Q395.5156,332.9375 395.5156,329.8125 Q395.5156,326.6875 396.8281,325.0313 Q398.1563,323.375 400.6563,323.375 Q401.3594,323.375 402,323.5313 Q402.6563,323.6875 403.2188,323.9844 L403.2188,326.7031 Q402.5938,326.125 402,325.8594 Q401.4063,325.5781 400.7813,325.5781 Q399.4375,325.5781 398.75,326.6563 Q398.0625,327.7188 398.0625,329.8125 Q398.0625,331.9063 398.75,332.9844 Q399.4375,334.0469 400.7813,334.0469 Q401.4063,334.0469 402,333.7813 Q402.5938,333.5 403.2188,332.9219 L403.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="420.75" y="334.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="352"/>
       <ellipse cx="355.5" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="364.5" y="360.2104">h(G * g) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="364.8047"/>
       <ellipse cx="355.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="364.5" y="373.0151">hh(GG * gg) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="379.6094" y2="379.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
       <ellipse cx="403.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.2188,208.1406 Q405.6406,208.4375 405,208.5781 Q404.3594,208.7344 403.6563,208.7344 Q401.1563,208.7344 399.8281,207.0938 Q398.5156,205.4375 398.5156,202.3125 Q398.5156,199.1875 399.8281,197.5313 Q401.1563,195.875 403.6563,195.875 Q404.3594,195.875 405,196.0313 Q405.6563,196.1875 406.2188,196.4844 L406.2188,199.2031 Q405.5938,198.625 405,198.3594 Q404.4063,198.0781 403.7813,198.0781 Q402.4375,198.0781 401.75,199.1563 Q401.0625,200.2188 401.0625,202.3125 Q401.0625,204.4063 401.75,205.4844 Q402.4375,206.5469 403.7813,206.5469 Q404.4063,206.5469 405,206.2813 Q405.5938,206 406.2188,205.4219 L406.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.75" y="206.6543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="218.5" y2="218.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="364.5" y="224.5"/>
       <ellipse cx="369.5" cy="229.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="378.5" y="232.7104">i(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="239.3047" y2="239.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17rlydk6ygm6o)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fugxi0b1fchwk)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
       <ellipse cx="403.65" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.6188,80.6406 Q406.0406,80.9375 405.4,81.0781 Q404.7594,81.2344 404.0563,81.2344 Q401.5563,81.2344 400.2281,79.5938 Q398.9156,77.9375 398.9156,74.8125 Q398.9156,71.6875 400.2281,70.0313 Q401.5563,68.375 404.0563,68.375 Q404.7594,68.375 405.4,68.5313 Q406.0563,68.6875 406.6188,68.9844 L406.6188,71.7031 Q405.9938,71.125 405.4,70.8594 Q404.8063,70.5781 404.1813,70.5781 Q402.8375,70.5781 402.15,71.6563 Q401.4625,72.7188 401.4625,74.8125 Q401.4625,76.9063 402.15,77.9844 Q402.8375,79.0469 404.1813,79.0469 Q404.8063,79.0469 405.4,78.7813 Q405.9938,78.5 406.6188,77.9219 L406.6188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.35" y="79.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="369" y="97"/>
       <ellipse cx="374" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="383" y="105.2104">i(I * i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="111.8047" y2="111.8047"/>
diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg
index d26a7b79..203547b1 100644
--- a/docs/test_cases/t00043_class_mermaid.svg
+++ b/docs/test_cases/t00043_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 733.625 633" style="max-width: 733.625px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 733.625 633" style="max-width: 733.625px; background-color: white;" width="733.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -62,99 +62,119 @@
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M546.484375,87L546.484375,91.16666666666667C546.484375,95.33333333333333,546.484375,103.66666666666667,546.484375,113.83333333333333C546.484375,124,546.484375,136,546.484375,142L546.484375,148"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L4">
+        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L4">
           <g title="A" id="classId-C_0001454679300998460550-0" class="node default clickable">
             <rect height="57" width="127" y="-28.5" x="-63.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -173,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L6">
+        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L6">
           <g title="B" id="classId-C_0001972977265990430931-1" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -197,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L10">
+        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L10">
           <g title="BB" id="classId-C_0001906291555025945295-2" class="node default clickable">
             <rect height="79" width="138.5625" y="-39.5" x="-69.28125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.28125" x1="-69.28125" class="divider"/>
@@ -221,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L14">
+        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L14">
           <g title="C" id="classId-C_0000823759225351121534-3" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -245,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L18">
+        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L18">
           <g title="D" id="classId-C_0002277976215348279426-4" class="node default clickable">
             <rect height="101" width="149.75" y="-50.5" x="-74.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -274,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L23">
+        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L23">
           <g title="E" id="classId-C_0001694685540293810116-5" class="node default clickable">
             <rect height="79" width="126.125" y="-39.5" x="-63.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -298,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L32">
+        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L32">
           <g title="G" id="classId-C_0000736400571183204899-6" class="node default clickable">
             <rect height="57" width="144.8125" y="-28.5" x="-72.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.40625" x1="-72.40625" class="divider"/>
@@ -317,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L34">
+        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L34">
           <g title="GG" id="classId-C_0001522297681294871411-7" class="node default clickable">
             <rect height="57" width="157.25" y="-28.5" x="-78.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="78.625" x1="-78.625" class="divider"/>
@@ -336,7 +356,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L36">
+        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L36">
           <g title="H" id="classId-C_0001534191494825314170-8" class="node default clickable">
             <rect height="101" width="153.296875" y="-50.5" x="-76.6484375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
@@ -365,7 +385,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L45">
+        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L45">
           <g title="I" id="classId-C_0000097422543769740359-9" class="node default clickable">
             <rect height="79" width="136.8125" y="-39.5" x="-68.40625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.40625" x1="-68.40625" class="divider"/>
@@ -389,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00043/t00043.cc#L49">
+        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00043/t00043.cc#L49">
           <g title="J" id="classId-C_0001498530043106438011-10" class="node default clickable">
             <rect height="79" width="141.265625" y="-39.5" x="-70.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="70.6328125" x1="-70.6328125" class="divider"/>
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md
index 09c09c38..eb6a9b1b 100644
--- a/docs/test_cases/t00044.md
+++ b/docs/test_cases/t00044.md
@@ -432,7 +432,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 506e782b..c4a75f4b 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_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="594px" preserveAspectRatio="none" style="width:517px;height:594px;" version="1.1" viewBox="0 0 517 594" width="517px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1e3qs5h5zkayf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mmlkl0en3wlr" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
       <ellipse cx="263" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M265.9688,447.6406 Q265.3906,447.9375 264.75,448.0781 Q264.1094,448.2344 263.4063,448.2344 Q260.9063,448.2344 259.5781,446.5938 Q258.2656,444.9375 258.2656,441.8125 Q258.2656,438.6875 259.5781,437.0313 Q260.9063,435.375 263.4063,435.375 Q264.1094,435.375 264.75,435.5313 Q265.4063,435.6875 265.9688,435.9844 L265.9688,438.7031 Q265.3438,438.125 264.75,437.8594 Q264.1563,437.5781 263.5313,437.5781 Q262.1875,437.5781 261.5,438.6563 Q260.8125,439.7188 260.8125,441.8125 Q260.8125,443.9063 261.5,444.9844 Q262.1875,446.0469 263.5313,446.0469 Q264.1563,446.0469 264.75,445.7813 Q265.3438,445.5 265.9688,444.9219 L265.9688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="277" y="446.1543">signal_handler</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="458" y2="458"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
       <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="275.1543">sink</text>
@@ -28,26 +28,26 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="69" y="264.1387">signal_handler&lt;Ret(Args...),A&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="26" y="301.2104">sink(signal_t &amp; sh) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="258" y1="307.8047" y2="307.8047"/>
     <ellipse cx="17" cy="318.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="26" y="322.0151">get_signal&lt;CastTo&gt;() : CastTo *</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="328.6094" y2="328.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="334.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="336.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="26" y="342.8198">signal : signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
       <ellipse cx="309" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M311.9688,299.6406 Q311.3906,299.9375 310.75,300.0781 Q310.1094,300.2344 309.4063,300.2344 Q306.9063,300.2344 305.5781,298.5938 Q304.2656,296.9375 304.2656,293.8125 Q304.2656,290.6875 305.5781,289.0313 Q306.9063,287.375 309.4063,287.375 Q310.1094,287.375 310.75,287.5313 Q311.4063,287.6875 311.9688,287.9844 L311.9688,290.7031 Q311.3438,290.125 310.75,289.8594 Q310.1563,289.5781 309.5313,289.5781 Q308.1875,289.5781 307.5,290.6563 Q306.8125,291.7188 306.8125,293.8125 Q306.8125,295.9063 307.5,296.9844 Q308.1875,298.0469 309.5313,298.0469 Q310.1563,298.0469 310.75,297.7813 Q311.3438,297.5 311.9688,296.9219 L311.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="323" y="298.1543">signal_handler</text>
@@ -56,8 +56,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
       <ellipse cx="153" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.9688,167.6406 Q155.3906,167.9375 154.75,168.0781 Q154.1094,168.2344 153.4063,168.2344 Q150.9063,168.2344 149.5781,166.5938 Q148.2656,164.9375 148.2656,161.8125 Q148.2656,158.6875 149.5781,157.0313 Q150.9063,155.375 153.4063,155.375 Q154.1094,155.375 154.75,155.5313 Q155.4063,155.6875 155.9688,155.9844 L155.9688,158.7031 Q155.3438,158.125 154.75,157.8594 Q154.1563,157.5781 153.5313,157.5781 Q152.1875,157.5781 151.5,158.6563 Q150.8125,159.7188 150.8125,161.8125 Q150.8125,163.9063 151.5,164.9844 Q152.1875,166.0469 153.5313,166.0469 Q154.1563,166.0469 154.75,165.7813 Q155.3438,165.5 155.9688,164.9219 L155.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="167" y="166.1543">sink</text>
@@ -66,23 +66,23 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
       <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="127" y="54"/>
       <ellipse cx="132" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="261" x="141" y="62.2104">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
       <ellipse cx="294.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M297.4688,556.6406 Q296.8906,556.9375 296.25,557.0781 Q295.6094,557.2344 294.9063,557.2344 Q292.4063,557.2344 291.0781,555.5938 Q289.7656,553.9375 289.7656,550.8125 Q289.7656,547.6875 291.0781,546.0313 Q292.4063,544.375 294.9063,544.375 Q295.6094,544.375 296.25,544.5313 Q296.9063,544.6875 297.4688,544.9844 L297.4688,547.7031 Q296.8438,547.125 296.25,546.8594 Q295.6563,546.5781 295.0313,546.5781 Q293.6875,546.5781 293,547.6563 Q292.3125,548.7188 292.3125,550.8125 Q292.3125,552.9063 293,553.9844 Q293.6875,555.0469 295.0313,555.0469 Q295.6563,555.0469 296.25,554.7813 Q296.8438,554.5 297.4688,553.9219 L297.4688,556.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="308.5" y="555.1543">signal_handler</text>
@@ -91,8 +91,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="567" y2="567"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="575" y2="575"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e3qs5h5zkayf)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mmlkl0en3wlr)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
       <ellipse cx="113.5" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M116.4688,447.6406 Q115.8906,447.9375 115.25,448.0781 Q114.6094,448.2344 113.9063,448.2344 Q111.4063,448.2344 110.0781,446.5938 Q108.7656,444.9375 108.7656,441.8125 Q108.7656,438.6875 110.0781,437.0313 Q111.4063,435.375 113.9063,435.375 Q114.6094,435.375 115.25,435.5313 Q115.9063,435.6875 116.4688,435.9844 L116.4688,438.7031 Q115.8438,438.125 115.25,437.8594 Q114.6563,437.5781 114.0313,437.5781 Q112.6875,437.5781 112,438.6563 Q111.3125,439.7188 111.3125,441.8125 Q111.3125,443.9063 112,444.9844 Q112.6875,446.0469 114.0313,446.0469 Q114.6563,446.0469 115.25,445.7813 Q115.8438,445.5 116.4688,444.9219 L116.4688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="127.5" y="446.1543">sink</text>
diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg
index 4f928ac4..b047c268 100644
--- a/docs/test_cases/t00044_class_mermaid.svg
+++ b/docs/test_cases/t00044_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.46875 625" style="max-width: 613.469px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.46875 625" style="max-width: 613.469px; background-color: white;" width="613.46875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -59,11 +59,13 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M293.828125,87L293.828125,92.66666666666667C293.828125,98.33333333333333,293.828125,109.66666666666667,293.828125,121C293.828125,132.33333333333334,293.828125,143.66666666666666,293.828125,149.33333333333334L293.828125,155"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -79,38 +81,46 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -128,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4">
+        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0001591729735727316875-0" class="node default clickable">
             <rect height="57" width="248.84375" y="-28.5" x="-124.421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.421875" x1="-124.421875" class="divider"/>
@@ -147,7 +157,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L9">
+        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L9">
           <g title="sink" id="classId-C_0000559574389062594251-1" class="node default clickable">
             <rect height="123" width="299.546875" y="-61.5" x="-149.7734375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="149.7734375" x1="-149.7734375" class="divider"/>
@@ -181,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4">
+        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0000103559998624864011-2" class="node default clickable">
             <rect height="57" width="247.921875" y="-28.5" x="-123.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="123.9609375" x1="-123.9609375" class="divider"/>
@@ -200,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4">
+        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001718007222067272862-3" class="node default clickable">
             <rect height="57" width="298.625" y="-28.5" x="-149.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.3125" x1="-149.3125" class="divider"/>
@@ -219,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L33">
+        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L33">
           <g title="R" id="classId-C_0001644484569399365272-4" class="node default clickable">
             <rect height="79" width="340.984375" y="-39.5" x="-170.4921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="170.4921875" x1="-170.4921875" class="divider"/>
@@ -243,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L6">
+        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L6">
           <g title="signal_handler" id="classId-C_0000276594465967577895-5" class="node default clickable">
             <rect height="57" width="170.609375" y="-28.5" x="-85.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.3046875" x1="-85.3046875" class="divider"/>
@@ -262,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00044/t00044.cc#L4">
+        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001759724482769288325-6" class="node default clickable">
             <rect height="57" width="75.484375" y="-28.5" x="-37.7421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="37.7421875" x1="-37.7421875" class="divider"/>
diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md
index d9817a1a..69271b20 100644
--- a/docs/test_cases/t00045.md
+++ b/docs/test_cases/t00045.md
@@ -463,7 +463,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index 911a9a6b..81fe8d24 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_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="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dy5mh35vf0ei" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11nkyx28sce7u" 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"/>
@@ -9,32 +9,32 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
       <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
       <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
       <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
       <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
@@ -43,110 +43,110 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="81.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="87.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
       <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
       <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
       <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
       <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
       <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
       <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
       <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dy5mh35vf0ei)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11nkyx28sce7u)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
       <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
       <ellipse cx="196" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="205" y="54.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="66.8047"/>
       <ellipse cx="196" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="205" y="75.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="79.6094"/>
       <ellipse cx="196" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="87.8198">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="92.4141"/>
       <ellipse cx="196" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="100.6245">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="105.2188"/>
       <ellipse cx="196" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="113.4292">root_a : ::A *</text>
     </a>
     <path d="M472.37,265.58 C471.86,279.36 471.31,294.06 470.87,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg
index 33d2ca48..66bf6457 100644
--- a/docs/test_cases/t00045_class_mermaid.svg
+++ b/docs/test_cases/t00045_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 787.625 415" style="max-width: 787.625px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 787.625 415" style="max-width: 787.625px; background-color: white;" width="787.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -98,11 +98,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -152,11 +154,11 @@
           </g>
         </g>
         <g transform="translate(468.765625, 209)" class="edgeLabel">
-          <g transform="translate(-14.015625, -9)" class="label">
-            <foreignObject height="18" width="28.03125">
+          <g transform="translate(-29.1328125, -9)" class="label">
+            <foreignObject height="18" width="58.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">+&lt;&gt;</span>
+                  <span class="edgeLabel">+[friend]</span>
                 </span>
               </div>
             </foreignObject>
@@ -164,7 +166,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L1">
+        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L1">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -183,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L3">
+        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L3">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -202,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L5">
+        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L5">
           <g title="AAA" id="classId-C_0000054164402597771463-2" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -221,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L7">
+        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L7">
           <g title="AAAA" id="classId-C_0000375905626569465019-3" class="node default clickable">
             <rect height="79" width="89.6875" y="-39.5" x="-44.84375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.84375" x1="-44.84375" class="divider"/>
@@ -245,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L13">
+        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L13">
           <g title="A" id="classId-C_0000619642232943663499-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -264,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L17">
+        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L17">
           <g title="A" id="classId-C_0002207007194029669343-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -283,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L19">
+        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L19">
           <g title="B" id="classId-C_0000204051985124373077-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -302,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L21">
+        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L21">
           <g title="C" id="classId-C_0001837009554564742531-7" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -321,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L23">
+        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L23">
           <g title="D" id="classId-C_0002029929560931799980-8" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -340,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L25">
+        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L25">
           <g title="E" id="classId-C_0002305358535757579772-9" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -359,7 +361,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L27">
+        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L27">
           <g title="AAA" id="classId-C_0001731264248793686366-10" class="node default clickable">
             <rect height="57" width="126.125" y="-28.5" x="-63.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -378,7 +380,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00045/t00045.cc#L29">
+        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00045/t00045.cc#L29">
           <g title="R" id="classId-C_0000974430595320588991-11" class="node default clickable">
             <rect height="167" width="196.015625" y="-83.5" x="-98.0078125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="98.0078125" x1="-98.0078125" class="divider"/>
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md
index 41c3a812..fb7902a8 100644
--- a/docs/test_cases/t00046.md
+++ b/docs/test_cases/t00046.md
@@ -396,7 +396,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index 176f7d42..9d767c7f 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_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="616px" preserveAspectRatio="none" style="width:586px;height:616px;" version="1.1" viewBox="0 0 586 616" width="586px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fry0b4bir4vu5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fa8xkybxmsp8x" 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"/>
@@ -9,120 +9,120 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fry0b4bir4vu5)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa8xkybxmsp8x)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#fry0b4bir4vu5)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fa8xkybxmsp8x)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="192.2969" y2="192.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="184.9951">ns2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
       <ellipse cx="123" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M125.9688,80.6406 Q125.3906,80.9375 124.75,81.0781 Q124.1094,81.2344 123.4063,81.2344 Q120.9063,81.2344 119.5781,79.5938 Q118.2656,77.9375 118.2656,74.8125 Q118.2656,71.6875 119.5781,70.0313 Q120.9063,68.375 123.4063,68.375 Q124.1094,68.375 124.75,68.5313 Q125.4063,68.6875 125.9688,68.9844 L125.9688,71.7031 Q125.3438,71.125 124.75,70.8594 Q124.1563,70.5781 123.5313,70.5781 Q122.1875,70.5781 121.5,71.6563 Q120.8125,72.7188 120.8125,74.8125 Q120.8125,76.9063 121.5,77.9844 Q122.1875,79.0469 123.5313,79.0469 Q124.1563,79.0469 124.75,78.7813 Q125.3438,78.5 125.9688,77.9219 L125.9688,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="137" y="79.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="91" y2="91"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="99" y2="99"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
       <ellipse cx="223" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M225.9688,428.6406 Q225.3906,428.9375 224.75,429.0781 Q224.1094,429.2344 223.4063,429.2344 Q220.9063,429.2344 219.5781,427.5938 Q218.2656,425.9375 218.2656,422.8125 Q218.2656,419.6875 219.5781,418.0313 Q220.9063,416.375 223.4063,416.375 Q224.1094,416.375 224.75,416.5313 Q225.4063,416.6875 225.9688,416.9844 L225.9688,419.7031 Q225.3438,419.125 224.75,418.8594 Q224.1563,418.5781 223.5313,418.5781 Q222.1875,418.5781 221.5,419.6563 Q220.8125,420.7188 220.8125,422.8125 Q220.8125,424.9063 221.5,425.9844 Q222.1875,427.0469 223.5313,427.0469 Q224.1563,427.0469 224.75,426.7813 Q225.3438,426.5 225.9688,425.9219 L225.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="237" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
       <ellipse cx="193" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.9688,537.6406 Q195.3906,537.9375 194.75,538.0781 Q194.1094,538.2344 193.4063,538.2344 Q190.9063,538.2344 189.5781,536.5938 Q188.2656,534.9375 188.2656,531.8125 Q188.2656,528.6875 189.5781,527.0313 Q190.9063,525.375 193.4063,525.375 Q194.1094,525.375 194.75,525.5313 Q195.4063,525.6875 195.9688,525.9844 L195.9688,528.7031 Q195.3438,528.125 194.75,527.8594 Q194.1563,527.5781 193.5313,527.5781 Q192.1875,527.5781 191.5,528.6563 Q190.8125,529.7188 190.8125,531.8125 Q190.8125,533.9063 191.5,534.9844 Q192.1875,536.0469 193.5313,536.0469 Q194.1563,536.0469 194.75,535.7813 Q195.3438,535.5 195.9688,534.9219 L195.9688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="536.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
       <ellipse cx="77" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M79.9688,265.1406 Q79.3906,265.4375 78.75,265.5781 Q78.1094,265.7344 77.4063,265.7344 Q74.9063,265.7344 73.5781,264.0938 Q72.2656,262.4375 72.2656,259.3125 Q72.2656,256.1875 73.5781,254.5313 Q74.9063,252.875 77.4063,252.875 Q78.1094,252.875 78.75,253.0313 Q79.4063,253.1875 79.9688,253.4844 L79.9688,256.2031 Q79.3438,255.625 78.75,255.3594 Q78.1563,255.0781 77.5313,255.0781 Q76.1875,255.0781 75.5,256.1563 Q74.8125,257.2188 74.8125,259.3125 Q74.8125,261.4063 75.5,262.4844 Q76.1875,263.5469 77.5313,263.5469 Q78.1563,263.5469 78.75,263.2813 Q79.3438,263 79.9688,262.4219 L79.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91" y="263.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
       <ellipse cx="268.5" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M271.4688,537.6406 Q270.8906,537.9375 270.25,538.0781 Q269.6094,538.2344 268.9063,538.2344 Q266.4063,538.2344 265.0781,536.5938 Q263.7656,534.9375 263.7656,531.8125 Q263.7656,528.6875 265.0781,527.0313 Q266.4063,525.375 268.9063,525.375 Q269.6094,525.375 270.25,525.5313 Q270.9063,525.6875 271.4688,525.9844 L271.4688,528.7031 Q270.8438,528.125 270.25,527.8594 Q269.6563,527.5781 269.0313,527.5781 Q267.6875,527.5781 267,528.6563 Q266.3125,529.7188 266.3125,531.8125 Q266.3125,533.9063 267,534.9844 Q267.6875,536.0469 269.0313,536.0469 Q269.6563,536.0469 270.25,535.7813 Q270.8438,535.5 271.4688,534.9219 L271.4688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="282.5" y="536.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
       <ellipse cx="371" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M373.9688,265.1406 Q373.3906,265.4375 372.75,265.5781 Q372.1094,265.7344 371.4063,265.7344 Q368.9063,265.7344 367.5781,264.0938 Q366.2656,262.4375 366.2656,259.3125 Q366.2656,256.1875 367.5781,254.5313 Q368.9063,252.875 371.4063,252.875 Q372.1094,252.875 372.75,253.0313 Q373.4063,253.1875 373.9688,253.4844 L373.9688,256.2031 Q373.3438,255.625 372.75,255.3594 Q372.1563,255.0781 371.5313,255.0781 Q370.1875,255.0781 369.5,256.1563 Q368.8125,257.2188 368.8125,259.3125 Q368.8125,261.4063 369.5,262.4844 Q370.1875,263.5469 371.5313,263.5469 Q372.1563,263.5469 372.75,263.2813 Q373.3438,263 373.9688,262.4219 L373.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385" y="263.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
       <ellipse cx="220.75" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.7188,226.6406 Q223.1406,226.9375 222.5,227.0781 Q221.8594,227.2344 221.1563,227.2344 Q218.6563,227.2344 217.3281,225.5938 Q216.0156,223.9375 216.0156,220.8125 Q216.0156,217.6875 217.3281,216.0313 Q218.6563,214.375 221.1563,214.375 Q221.8594,214.375 222.5,214.5313 Q223.1563,214.6875 223.7188,214.9844 L223.7188,217.7031 Q223.0938,217.125 222.5,216.8594 Q221.9063,216.5781 221.2813,216.5781 Q219.9375,216.5781 219.25,217.6563 Q218.5625,218.7188 218.5625,220.8125 Q218.5625,222.9063 219.25,223.9844 Q219.9375,225.0469 221.2813,225.0469 Q221.9063,225.0469 222.5,224.7813 Q223.0938,224.5 223.7188,223.9219 L223.7188,226.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="241.25" y="225.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="243"/>
       <ellipse cx="148" cy="248" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="157" y="251.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="257.8047" y2="257.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="263.8047"/>
       <ellipse cx="148" cy="268.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="157" y="272.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="276.6094"/>
       <ellipse cx="148" cy="281.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="157" y="284.8198">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="289.4141"/>
       <ellipse cx="148" cy="294.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="157" y="297.6245">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="302.2188"/>
       <ellipse cx="148" cy="307.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="157" y="310.4292">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="315.0234"/>
       <ellipse cx="148" cy="320.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="157" y="323.2339">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
       <ellipse cx="550" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M552.9688,428.6406 Q552.3906,428.9375 551.75,429.0781 Q551.1094,429.2344 550.4063,429.2344 Q547.9063,429.2344 546.5781,427.5938 Q545.2656,425.9375 545.2656,422.8125 Q545.2656,419.6875 546.5781,418.0313 Q547.9063,416.375 550.4063,416.375 Q551.1094,416.375 551.75,416.5313 Q552.4063,416.6875 552.9688,416.9844 L552.9688,419.7031 Q552.3438,419.125 551.75,418.8594 Q551.1563,418.5781 550.5313,418.5781 Q549.1875,418.5781 548.5,419.6563 Q547.8125,420.7188 547.8125,422.8125 Q547.8125,424.9063 548.5,425.9844 Q549.1875,427.0469 550.5313,427.0469 Q551.1563,427.0469 551.75,426.7813 Q552.3438,426.5 552.9688,425.9219 L552.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="564" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fry0b4bir4vu5)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa8xkybxmsp8x)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
       <ellipse cx="467" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.9688,428.6406 Q469.3906,428.9375 468.75,429.0781 Q468.1094,429.2344 467.4063,429.2344 Q464.9063,429.2344 463.5781,427.5938 Q462.2656,425.9375 462.2656,422.8125 Q462.2656,419.6875 463.5781,418.0313 Q464.9063,416.375 467.4063,416.375 Q468.1094,416.375 468.75,416.5313 Q469.4063,416.6875 469.9688,416.9844 L469.9688,419.7031 Q469.3438,419.125 468.75,418.8594 Q468.1563,418.5781 467.5313,418.5781 Q466.1875,418.5781 465.5,419.6563 Q464.8125,420.7188 464.8125,422.8125 Q464.8125,424.9063 465.5,425.9844 Q466.1875,427.0469 467.5313,427.0469 Q468.1563,427.0469 468.75,426.7813 Q469.3438,426.5 469.9688,425.9219 L469.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="427.1543">AA</text>
diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg
index 9b079680..7532e6f8 100644
--- a/docs/test_cases/t00046_class_mermaid.svg
+++ b/docs/test_cases/t00046_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 611.66796875 437" style="max-width: 611.668px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 611.66796875 437" style="max-width: 611.668px; background-color: white;" width="611.66796875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -97,11 +97,13 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -152,7 +154,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L4">
+        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L4">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -171,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L6">
+        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L6">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -190,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L10">
+        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L10">
           <g title="A" id="classId-C_0000619642232943663499-2" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -209,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L14">
+        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L14">
           <g title="A" id="classId-C_0002207007194029669343-3" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -228,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L16">
+        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L16">
           <g title="B" id="classId-C_0000204051985124373077-4" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -247,7 +249,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L18">
+        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L18">
           <g title="C" id="classId-C_0001837009554564742531-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -266,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L20">
+        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L20">
           <g title="D" id="classId-C_0002029929560931799980-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -285,7 +287,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L22">
+        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L22">
           <g title="E" id="classId-C_0002305358535757579772-7" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -304,7 +306,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00046/t00046.cc#L24">
+        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00046/t00046.cc#L24">
           <g title="R" id="classId-C_0000974430595320588991-8" class="node default clickable">
             <rect height="189" width="212" y="-94.5" x="-106" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="106" x1="-106" class="divider"/>
diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md
index 3e44ff15..b0ec290e 100644
--- a/docs/test_cases/t00047.md
+++ b/docs/test_cases/t00047.md
@@ -194,7 +194,7 @@ using conditional = typename conditional_t<Ts...>::type;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 02837f88..833f0ad5 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_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="175px" preserveAspectRatio="none" style="width:799px;height:175px;" version="1.1" viewBox="0 0 799 175" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fglvfwkhtb8ir" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fe2mrws4izgl7" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fglvfwkhtb8ir)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe2mrws4izgl7)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fglvfwkhtb8ir)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe2mrws4izgl7)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
       <ellipse cx="197.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,29.6406 Q199.8906,29.9375 199.25,30.0781 Q198.6094,30.2344 197.9063,30.2344 Q195.4063,30.2344 194.0781,28.5938 Q192.7656,26.9375 192.7656,23.8125 Q192.7656,20.6875 194.0781,19.0313 Q195.4063,17.375 197.9063,17.375 Q198.6094,17.375 199.25,17.5313 Q199.9063,17.6875 200.4688,17.9844 L200.4688,20.7031 Q199.8438,20.125 199.25,19.8594 Q198.6563,19.5781 198.0313,19.5781 Q196.6875,19.5781 196,20.6563 Q195.3125,21.7188 195.3125,23.8125 Q195.3125,25.9063 196,26.9844 Q196.6875,28.0469 198.0313,28.0469 Q198.6563,28.0469 199.25,27.7813 Q199.8438,27.5 200.4688,26.9219 L200.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="28.1543">conditional_t</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fglvfwkhtb8ir)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe2mrws4izgl7)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
       <ellipse cx="515" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M517.9688,29.6406 Q517.3906,29.9375 516.75,30.0781 Q516.1094,30.2344 515.4063,30.2344 Q512.9063,30.2344 511.5781,28.5938 Q510.2656,26.9375 510.2656,23.8125 Q510.2656,20.6875 511.5781,19.0313 Q512.9063,17.375 515.4063,17.375 Q516.1094,17.375 516.75,17.5313 Q517.4063,17.6875 517.9688,17.9844 L517.9688,20.7031 Q517.3438,20.125 516.75,19.8594 Q516.1563,19.5781 515.5313,19.5781 Q514.1875,19.5781 513.5,20.6563 Q512.8125,21.7188 512.8125,23.8125 Q512.8125,25.9063 513.5,26.9844 Q514.1875,28.0469 515.5313,28.0469 Q516.1563,28.0469 516.75,27.7813 Q517.3438,27.5 517.9688,26.9219 L517.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="28.1543">conditional_t</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fglvfwkhtb8ir)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe2mrws4izgl7)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
       <ellipse cx="268" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M270.9688,137.6406 Q270.3906,137.9375 269.75,138.0781 Q269.1094,138.2344 268.4063,138.2344 Q265.9063,138.2344 264.5781,136.5938 Q263.2656,134.9375 263.2656,131.8125 Q263.2656,128.6875 264.5781,127.0313 Q265.9063,125.375 268.4063,125.375 Q269.1094,125.375 269.75,125.5313 Q270.4063,125.6875 270.9688,125.9844 L270.9688,128.7031 Q270.3438,128.125 269.75,127.8594 Q269.1563,127.5781 268.5313,127.5781 Q267.1875,127.5781 266.5,128.6563 Q265.8125,129.7188 265.8125,131.8125 Q265.8125,133.9063 266.5,134.9844 Q267.1875,136.0469 268.5313,136.0469 Q269.1563,136.0469 269.75,135.7813 Q270.3438,135.5 270.9688,134.9219 L270.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="136.1543">conditional_t</text>
diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg
index f434bc56..208e4fea 100644
--- a/docs/test_cases/t00047_class_mermaid.svg
+++ b/docs/test_cases/t00047_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 963.25 180" style="max-width: 963.25px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 963.25 180" style="max-width: 963.25px; background-color: white;" width="963.25" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -55,36 +55,42 @@
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M783.4140625,65L783.4140625,69.16666666666667C783.4140625,73.33333333333333,783.4140625,81.66666666666667,731.9947916666666,92.87712542508501C680.5755208333334,104.08758418350335,577.7369791666666,118.17516836700673,526.3177083333334,125.21896045875842L474.8984375,132.2627525505101"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L8">
+        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L8">
           <g title="conditional_t" id="classId-C_0000047394280824625133-0" class="node default clickable">
             <rect height="57" width="166.15625" y="-28.5" x="-83.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.078125" x1="-83.078125" class="divider"/>
@@ -103,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L13">
+        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L13">
           <g title="conditional_t" id="classId-C_0000599782159389775809-1" class="node default clickable">
             <rect height="57" width="337.421875" y="-28.5" x="-168.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="168.7109375" x1="-168.7109375" class="divider"/>
@@ -122,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L18">
+        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L18">
           <g title="conditional_t" id="classId-C_0000824938194184364511-2" class="node default clickable">
             <rect height="57" width="343.671875" y="-28.5" x="-171.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="171.8359375" x1="-171.8359375" class="divider"/>
@@ -141,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00047/t00047.cc#L6">
+        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00047/t00047.cc#L6">
           <g title="conditional_t" id="classId-C_0001673692992642087414-3" class="node default clickable">
             <rect height="57" width="164.0625" y="-28.5" x="-82.03125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.03125" x1="-82.03125" class="divider"/>
diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md
index 3e24087d..4cecca85 100644
--- a/docs/test_cases/t00048.md
+++ b/docs/test_cases/t00048.md
@@ -545,7 +545,7 @@ template <typename T> struct BaseTemplate {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index 91df6e20..566a2771 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_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="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fptg2s0hln75k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1uua009ti1iz4" 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"/>
@@ -9,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
       <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
       <ellipse cx="92.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="66.8047"/>
       <ellipse cx="92.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="75.0151">base : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
       <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
@@ -40,45 +40,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
       <ellipse cx="295" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="66.8047"/>
       <ellipse cx="295" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="75.0151">base : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
       <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
       <ellipse cx="17" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="200.8047"/>
       <ellipse cx="17" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="209.0151">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
       <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
@@ -86,45 +86,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
       <ellipse cx="273" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="200.8047"/>
       <ellipse cx="273" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="209.0151">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
       <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
       <ellipse cx="139" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="200.8047"/>
       <ellipse cx="139" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="209.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fptg2s0hln75k)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uua009ti1iz4)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
       <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
@@ -132,19 +132,19 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
       <ellipse cx="417" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="426" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="200.8047"/>
       <ellipse cx="417" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="209.0151">a : T</text>
     </a>
     <path d="M102.14,99.04 C92.53,113.46 82.34,128.74 73.52,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg
index 94192c15..927e203f 100644
--- a/docs/test_cases/t00048_class_mermaid.svg
+++ b/docs/test_cases/t00048_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 612.84375 290" style="max-width: 612.844px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 612.84375 290" style="max-width: 612.844px; background-color: white;" width="612.84375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -94,7 +94,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L6">
+        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L6">
           <g title="Base" id="classId-C_0000010200626899013233-0" class="node default clickable">
             <rect height="123" width="99.9375" y="-61.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -123,7 +123,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/t00048.h#L12">
+        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/t00048.h#L12">
           <g title="BaseTemplate" id="classId-C_0000630197772543569536-1" class="node default clickable">
             <rect height="123" width="150.765625" y="-61.5" x="-75.3828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.3828125" x1="-75.3828125" class="divider"/>
@@ -152,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L8">
+        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L8">
           <g title="B" id="classId-C_0000059336049758992190-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/b_t00048.h#L14">
+        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/b_t00048.h#L14">
           <g title="BTemplate" id="classId-C_0001635850649347735305-3" class="node default clickable">
             <rect height="101" width="124.078125" y="-50.5" x="-62.0390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="62.0390625" x1="-62.0390625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L8">
+        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L8">
           <g title="A" id="classId-C_0000199333691834211223-4" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -239,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00048/a_t00048.h#L14">
+        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00048/a_t00048.h#L14">
           <g title="ATemplate" id="classId-C_0001025697108404463905-5" class="node default clickable">
             <rect height="101" width="122.890625" y="-50.5" x="-61.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.4453125" x1="-61.4453125" class="divider"/>
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md
index 593f6a27..6c3b7f8b 100644
--- a/docs/test_cases/t00049.md
+++ b/docs/test_cases/t00049.md
@@ -327,7 +327,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 929353fa..ab3b8513 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_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="390px" preserveAspectRatio="none" style="width:401px;height:390px;" version="1.1" viewBox="0 0 401 390" width="401px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgbj6djukb3zv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f660a94kzm0nn" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgbj6djukb3zv)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f660a94kzm0nn)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
       <ellipse cx="165.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.6188,327.6406 Q168.0406,327.9375 167.4,328.0781 Q166.7594,328.2344 166.0563,328.2344 Q163.5563,328.2344 162.2281,326.5938 Q160.9156,324.9375 160.9156,321.8125 Q160.9156,318.6875 162.2281,317.0313 Q163.5563,315.375 166.0563,315.375 Q166.7594,315.375 167.4,315.5313 Q168.0563,315.6875 168.6188,315.9844 L168.6188,318.7031 Q167.9938,318.125 167.4,317.8594 Q166.8063,317.5781 166.1813,317.5781 Q164.8375,317.5781 164.15,318.6563 Q163.4625,319.7188 163.4625,321.8125 Q163.4625,323.9063 164.15,324.9844 Q164.8375,326.0469 166.1813,326.0469 Q166.8063,326.0469 167.4,325.7813 Q167.9938,325.5 168.6188,324.9219 L168.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="184.35" y="326.1543">A</text>
@@ -18,23 +18,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="222.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="344"/>
       <ellipse cx="140.5" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="149.5" y="352.2104">get_a() : T &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="358.8047" y2="358.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="364.8047"/>
       <ellipse cx="140.5" cy="369.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="149.5" y="373.0151">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgbj6djukb3zv)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f660a94kzm0nn)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
@@ -43,8 +43,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgbj6djukb3zv)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f660a94kzm0nn)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
       <ellipse cx="143.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M146.4688,218.6406 Q145.8906,218.9375 145.25,219.0781 Q144.6094,219.2344 143.9063,219.2344 Q141.4063,219.2344 140.0781,217.5938 Q138.7656,215.9375 138.7656,212.8125 Q138.7656,209.6875 140.0781,208.0313 Q141.4063,206.375 143.9063,206.375 Q144.6094,206.375 145.25,206.5313 Q145.9063,206.6875 146.4688,206.9844 L146.4688,209.7031 Q145.8438,209.125 145.25,208.8594 Q144.6563,208.5781 144.0313,208.5781 Q142.6875,208.5781 142,209.6563 Q141.3125,210.7188 141.3125,212.8125 Q141.3125,214.9063 142,215.9844 Q142.6875,217.0469 144.0313,217.0469 Q144.6563,217.0469 145.25,216.7813 Q145.8438,216.5 146.4688,215.9219 L146.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.5" y="217.1543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgbj6djukb3zv)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f660a94kzm0nn)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
       <ellipse cx="278.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M281.4688,218.6406 Q280.8906,218.9375 280.25,219.0781 Q279.6094,219.2344 278.9063,219.2344 Q276.4063,219.2344 275.0781,217.5938 Q273.7656,215.9375 273.7656,212.8125 Q273.7656,209.6875 275.0781,208.0313 Q276.4063,206.375 278.9063,206.375 Q279.6094,206.375 280.25,206.5313 Q280.9063,206.6875 281.4688,206.9844 L281.4688,209.7031 Q280.8438,209.125 280.25,208.8594 Q279.6563,208.5781 279.0313,208.5781 Q277.6875,208.5781 277,209.6563 Q276.3125,210.7188 276.3125,212.8125 Q276.3125,214.9063 277,215.9844 Q277.6875,217.0469 279.0313,217.0469 Q279.6563,217.0469 280.25,216.7813 Q280.8438,216.5 281.4688,215.9219 L281.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="292.5" y="217.1543">A</text>
@@ -63,47 +63,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgbj6djukb3zv)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f660a94kzm0nn)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
       <ellipse cx="170.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.2188,29.6406 Q172.6406,29.9375 172,30.0781 Q171.3594,30.2344 170.6563,30.2344 Q168.1563,30.2344 166.8281,28.5938 Q165.5156,26.9375 165.5156,23.8125 Q165.5156,20.6875 166.8281,19.0313 Q168.1563,17.375 170.6563,17.375 Q171.3594,17.375 172,17.5313 Q172.6563,17.6875 173.2188,17.9844 L173.2188,20.7031 Q172.5938,20.125 172,19.8594 Q171.4063,19.5781 170.7813,19.5781 Q169.4375,19.5781 168.75,20.6563 Q168.0625,21.7188 168.0625,23.8125 Q168.0625,25.9063 168.75,26.9844 Q169.4375,28.0469 170.7813,28.0469 Q171.4063,28.0469 172,27.7813 Q172.5938,27.5 173.2188,26.9219 L173.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="46"/>
       <ellipse cx="52" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="61" y="54.2104">get_int_map() : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="58.8047"/>
       <ellipse cx="52" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="61" y="67.0151">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="79.6094"/>
       <ellipse cx="52" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="87.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="92.4141"/>
       <ellipse cx="52" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="100.6245">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="105.2188"/>
       <ellipse cx="52" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="61" y="113.4292">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
     <path d="M74.37,245.14 C88.77,258.53 107.47,275.93 125.05,292.27 " fill="none" id="C_0000654829353386288443-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg
index e1d131f9..5f7efdaf 100644
--- a/docs/test_cases/t00049_class_mermaid.svg
+++ b/docs/test_cases/t00049_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.984375 459" style="max-width: 473.984px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.984375 459" style="max-width: 473.984px; background-color: white;" width="473.984375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -58,29 +58,35 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M101.89375,175L94.38541666666667,180.66666666666666C86.87708333333335,186.33333333333334,71.86041666666667,197.66666666666666,64.35208333333334,209C56.84375,220.33333333333334,56.84375,231.66666666666666,56.84375,237.33333333333334L56.84375,243"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -120,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000372971769516871577-0" class="node default clickable">
             <rect height="101" width="112.6875" y="-50.5" x="-56.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="56.34375" x1="-56.34375" class="divider"/>
@@ -149,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7">
+        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000654829353386288443-1" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -168,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000973058255816844469-2" class="node default clickable">
             <rect height="57" width="113.6875" y="-28.5" x="-56.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.84375" x1="-56.84375" class="divider"/>
@@ -187,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L7">
+        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000562074851310302010-3" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -206,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00049/t00049.cc#L13">
+        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00049/t00049.cc#L13">
           <g title="R" id="classId-C_0002288024073053091226-4" class="node default clickable">
             <rect height="167" width="267.140625" y="-83.5" x="-133.5703125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md
index 23de4c42..5521822e 100644
--- a/docs/test_cases/t00050.md
+++ b/docs/test_cases/t00050.md
@@ -65,7 +65,7 @@ diagrams:
           {% endfor %}
 
           {% endif %}
-          {# Render template paramete if any #}
+          {# Render template parameters if any #}
           {% if existsIn(e, "comment") and existsIn(e.comment, "tparam") %}
           {% set c=e.comment %} 
 
@@ -78,6 +78,32 @@ diagrams:
 
           {% endif %}
           {% endfor %}
+    mermaid:
+      after:
+        - |
+          note for {{ alias("NoSuchClass") }} "{{ comment("NoSuchClass").formatted }}"
+        - |
+          note for {{ alias("A") }} "{{ comment("clanguml::t00050::A").formatted }}"
+        - |
+          note for {{ element("clanguml::t00050::A").alias }} {% set e=element("clanguml::t00050::A") %} "{{ e.comment.formatted }}"
+          note for {{ alias("C") }} "{{ trim(comment("clanguml::t00050::C").text) }}"
+          {% set cmt=comment("clanguml::t00050::G").paragraph %}
+          note for {{ alias("G") }} "{{ trim(cmt.0) }}"
+          note for {{ alias("G") }} "{{ trim(cmt.1) }}"
+          note for {{ alias("G") }} "{{ trim(cmt.2) }}"
+        - |
+          {# Render brief comments and todos, if any were written for an element #}
+          {% for e in diagram.elements %}
+          {% if existsIn(e, "comment") and existsIn(e.comment, "brief") %}
+          note for {{ e.alias }} {% set c=e.comment %} "{{ c.brief.0 }}"
+          {% endif %}
+          {% if existsIn(e, "comment") and existsIn(e.comment, "todo") %}
+          {% set c=e.comment %}
+          {% for t in c.todo %}
+          note for {{ e.alias }} "**TODO** {{ t }}"
+          {% endfor %}
+          {% endif %}
+          {% endfor %}
 
 ```
 ## Source code
@@ -506,7 +532,7 @@ class NoComment { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index deb1171c..8d95bb73 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_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="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5ezu6gv19i6j" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgvorfxw4b0nh" 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"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
       <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
       <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
       <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
       <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
       <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
       <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
@@ -62,43 +62,43 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="402"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="404"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="410.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="414.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="416.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="423.0151">v : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
       <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ezu6gv19i6j)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvorfxw4b0nh)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
       <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
     </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
@@ -125,50 +125,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f5ezu6gv19i6j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#fgvorfxw4b0nh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg
index 979d2d64..406026a6 100644
--- a/docs/test_cases/t00050_class_mermaid.svg
+++ b/docs/test_cases/t00050_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 881.984375 161" style="max-width: 881.984px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 4049.046875 632" style="max-width: 4049.05px; background-color: white;" width="4049.046875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -49,10 +49,142 @@
     </defs>
     <g class="root">
       <g class="clusters"/>
-      <g class="edgePaths"/>
-      <g class="edgeLabels"/>
+      <g class="edgePaths">
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote1" d="M423.8359375,257L423.8359375,297.1666666666667C423.8359375,337.3333333333333,423.8359375,417.6666666666667,439.78515625,468.8831039262074C455.734375,520.0995411857481,487.6328125,542.1990823714962,503.58203125,553.2488529643703L519.53125,564.2986235572442"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote2" d="M641.7890625,257L641.7890625,297.1666666666667C641.7890625,337.3333333333333,641.7890625,417.6666666666667,625.83984375,468.8831039262074C609.890625,520.0995411857481,577.9921875,542.1990823714962,562.04296875,553.2488529643703L546.09375,564.2986235572442"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote3" d="M1062.5390625,473L1062.5390625,477.1666666666667C1062.5390625,481.3333333333333,1062.5390625,489.6666666666667,1096.1302083333333,505.6387313016705C1129.7213541666667,521.6107959366742,1196.9036458333333,545.2215918733483,1230.4947916666667,557.0269898416855L1264.0859375,568.8323878100225"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote4" d="M1773.296875,257L1773.296875,297.1666666666667C1773.296875,337.3333333333333,1773.296875,417.6666666666667,1830.5299479166667,469.93300993174654C1887.7630208333333,522.1993531968266,2002.2291666666667,546.398706393653,2059.4622395833335,558.4983829920662L2116.6953125,570.5980595904796"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote5" d="M2130.421875,257L2130.421875,297.1666666666667C2130.421875,337.3333333333333,2130.421875,417.6666666666667,2130.421875,465.6666666666667C2130.421875,513.6666666666666,2130.421875,529.3333333333334,2130.421875,537.1666666666666L2130.421875,545"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote6" d="M2484.8828125,257L2484.8828125,297.1666666666667C2484.8828125,337.3333333333333,2484.8828125,417.6666666666667,2428.09375,469.929374857655C2371.3046875,522.1920830486434,2257.7265625,546.3841660972868,2200.9375,558.4802076216084L2144.1484375,570.5762491459302"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote7" d="M2724.1796875,257L2724.1796875,297.1666666666667C2724.1796875,337.3333333333333,2724.1796875,417.6666666666667,2788.322265625,469.9969053435764C2852.46484375,522.3271440204861,2980.75,546.6542880409721,3044.892578125,558.8178600512151L3109.03515625,570.9814320614581"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote8" d="M2976.9609375,266L2976.9609375,304.6666666666667C2976.9609375,343.3333333333333,2976.9609375,420.6666666666667,2998.9733072916665,470.76691704066C3020.9856770833335,520.8671674146534,3065.0104166666665,543.7343348293067,3087.0227864583335,555.1679185366335L3109.03515625,566.6015022439601"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M3267.671875,266L3267.671875,304.6666666666667C3267.671875,343.3333333333333,3267.671875,420.6666666666667,3245.6595052083335,470.76691704066C3223.6471354166665,520.8671674146534,3179.6223958333335,543.7343348293067,3157.6100260416665,555.1679185366335L3135.59765625,566.6015022439601"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M3500.7265625,257L3500.7265625,297.1666666666667C3500.7265625,337.3333333333333,3500.7265625,417.6666666666667,3439.8717447916665,469.9750231402627C3379.0169270833335,522.2833796138588,3257.3072916666665,546.5667592277174,3196.4524739583335,558.7084490346467L3135.59765625,570.850138841576"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M1492.1953125,257L1492.1953125,297.1666666666667C1492.1953125,337.3333333333333,1492.1953125,417.6666666666667,1458.6041666666667,469.6387313016705C1425.0130208333333,521.6107959366742,1357.8307291666667,545.2215918733483,1324.2395833333333,557.0269898416855L1290.6484375,568.8323878100225"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote12" d="M3731.265625,257L3731.265625,297.1666666666667C3731.265625,337.3333333333333,3731.265625,417.6666666666667,3731.265625,465.6666666666667C3731.265625,513.6666666666666,3731.265625,529.3333333333334,3731.265625,537.1666666666666L3731.265625,545"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote13" d="M3955.734375,257L3955.734375,297.1666666666667C3955.734375,337.3333333333333,3955.734375,417.6666666666667,3955.734375,462C3955.734375,506.3333333333333,3955.734375,514.6666666666666,3955.734375,518.8333333333334L3955.734375,523"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L9">
+        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L9">
           <g title="A" id="classId-C_0001885563213397742674-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L24">
+        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L24">
           <g title="Lorem ipsum" id="classId-C_0000500262098409836244-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -90,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L53">
+        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L53">
           <g title="Long comment example" id="classId-C_0001663081653671078922-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(272.7421875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L65">
+        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L65">
           <g title="D" id="classId-C_0001492514566602019299-3" class="node default clickable">
             <rect height="57" width="70.109375" y="-28.5" x="-35.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.0546875" x1="-35.0546875" class="divider"/>
@@ -128,15 +260,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(419.5546875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L70">
+        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L70">
           <g title="E" id="classId-C_0002027344031570117998-4" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -5.3359375, -43)" height="18" width="10.671875" class="classTitle">
@@ -144,17 +276,17 @@
                   <span class="nodeLabel">E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="19.578125">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="19.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">E1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="19.578125">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="19.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">E2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="19.578125">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="19.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">E3</span>
                 </div>
@@ -162,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(583.8671875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L81">
+        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L81">
           <g title="Simple array wrapper." id="classId-C_0000793698410848959592-5" class="node default clickable">
             <rect height="101" width="105.109375" y="-50.5" x="-52.5546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.5546875" x1="-52.5546875" class="divider"/>
@@ -191,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.1484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L91">
+        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L91">
           <g title="G" id="classId-C_0000449485154531299941-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -210,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(818.9296875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00050/t00050.cc#L93">
+        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00050/t00050.cc#L93">
           <g title="NoComment" id="classId-C_0001832693799357996932-7" class="node default clickable">
             <rect height="57" width="110.109375" y="-28.5" x="-55.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -229,6 +361,149 @@
             </g>
           </g>
         </a>
+        <g transform="translate(423.8359375, 240.5)" id="note0" class="node undefined">
+          <rect height="33" width="167.953125" y="-16.5" x="-83.9765625" ry="0" rx="0"/>
+          <g transform="translate(-76.4765625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="152.953125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">Lorem ipsum dolor sit</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(641.7890625, 240.5)" id="note1" class="node undefined">
+          <rect height="33" width="167.953125" y="-16.5" x="-83.9765625" ry="0" rx="0"/>
+          <g transform="translate(-76.4765625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="152.953125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">Lorem ipsum dolor sit</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1062.5390625, 240.5)" id="note2" class="node undefined">
+          <rect height="465" width="573.546875" y="-232.5" x="-286.7734375" ry="0" rx="0"/>
+          <g transform="translate(-279.2734375, -225)" style="" class="label">
+            <rect/>
+            <foreignObject height="450" width="558.546875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis<br/> vehicula class ultricies mollis dictumst, aenean non a in donec nulla.<br/> Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,<br/> integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora<br/> tellus ligula porttitor metus.<br/><br/> Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,<br/> euismod libero facilisi aptent elementum felis blandit cursus gravida sociis<br/> erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est<br/> ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo<br/> ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat<br/> volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia<br/> conubia mauris tempor, etiam ultricies proin quisque lectus sociis id<br/> tristique, integer phasellus taciti pretium adipiscing tortor sagittis<br/> ligula.<br/><br/> Mollis pretium lorem primis senectus habitasse lectus scelerisque<br/> donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat<br/> pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim<br/> lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis<br/> taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh<br/> est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus<br/> imperdiet praesent magnis ridiculus congue gravida curabitur dictum<br/> sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,<br/> aenean vel nostra tellus commodo pretium sapien sociosqu.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1773.296875, 240.5)" id="note3" class="node undefined">
+          <rect height="33" width="276.4375" y="-16.5" x="-138.21875" ry="0" rx="0"/>
+          <g transform="translate(-130.71875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="261.4375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is a short description of class G.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(2130.421875, 240.5)" id="note4" class="node undefined">
+          <rect height="33" width="337.8125" y="-16.5" x="-168.90625" ry="0" rx="0"/>
+          <g transform="translate(-161.40625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="322.8125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is an intermediate description of class G.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(2484.8828125, 240.5)" id="note5" class="node undefined">
+          <rect height="33" width="271.109375" y="-16.5" x="-135.5546875" ry="0" rx="0"/>
+          <g transform="translate(-128.0546875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="256.109375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is a long description of class G.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(2724.1796875, 240.5)" id="note6" class="node undefined">
+          <rect height="33" width="107.484375" y="-16.5" x="-53.7421875" ry="0" rx="0"/>
+          <g transform="translate(-46.2421875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="92.484375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel"> Lorem ipsum<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(2976.9609375, 240.5)" id="note7" class="node undefined">
+          <rect height="51" width="298.078125" y="-25.5" x="-149.0390625" ry="0" rx="0"/>
+          <g transform="translate(-141.5390625, -18)" style="" class="label">
+            <rect/>
+            <foreignObject height="36" width="283.078125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">**TODO**  1. Write meaningful comment<br/> <br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(3267.671875, 240.5)" id="note8" class="node undefined">
+          <rect height="51" width="183.34375" y="-25.5" x="-91.671875" ry="0" rx="0"/>
+          <g transform="translate(-84.171875, -18)" style="" class="label">
+            <rect/>
+            <foreignObject height="36" width="168.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">**TODO**  2. Write tests<br/> <br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(3500.7265625, 240.5)" id="note9" class="node undefined">
+          <rect height="33" width="182.765625" y="-16.5" x="-91.3828125" ry="0" rx="0"/>
+          <g transform="translate(-83.8828125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="167.765625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">**TODO**  3. Implement<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1492.1953125, 240.5)" id="note10" class="node undefined">
+          <rect height="33" width="185.765625" y="-16.5" x="-92.8828125" ry="0" rx="0"/>
+          <g transform="translate(-85.3828125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="170.765625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel"> Long comment example<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(3731.265625, 240.5)" id="note11" class="node undefined">
+          <rect height="33" width="178.3125" y="-16.5" x="-89.15625" ry="0" rx="0"/>
+          <g transform="translate(-81.65625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="163.3125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">**TODO**  Implement...<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(3955.734375, 240.5)" id="note12" class="node undefined">
+          <rect height="33" width="170.625" y="-16.5" x="-85.3125" ry="0" rx="0"/>
+          <g transform="translate(-77.8125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="155.625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel"> Simple array wrapper.<br/></span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
       </g>
     </g>
   </g>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
index 1da67b36..84fa4d84 100644
--- a/docs/test_cases/t00051.md
+++ b/docs/test_cases/t00051.md
@@ -639,7 +639,7 @@ A::custom_thread2 A::start_thread2()
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index 063a725f..1dc6236c 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_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="599px" preserveAspectRatio="none" style="width:889px;height:599px;" version="1.1" viewBox="0 0 889 599" width="889px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1h3mqqfh92grh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jhbf44rj4fit" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3mqqfh92grh)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="371" y="468"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jhbf44rj4fit)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="371" y="468"/>
       <ellipse cx="425.25" cy="484" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M428.2188,489.6406 Q427.6406,489.9375 427,490.0781 Q426.3594,490.2344 425.6563,490.2344 Q423.1563,490.2344 421.8281,488.5938 Q420.5156,486.9375 420.5156,483.8125 Q420.5156,480.6875 421.8281,479.0313 Q423.1563,477.375 425.6563,477.375 Q426.3594,477.375 427,477.5313 Q427.6563,477.6875 428.2188,477.9844 L428.2188,480.7031 Q427.5938,480.125 427,479.8594 Q426.4063,479.5781 425.7813,479.5781 Q424.4375,479.5781 423.75,480.6563 Q423.0625,481.7188 423.0625,483.8125 Q423.0625,485.9063 423.75,486.9844 Q424.4375,488.0469 425.7813,488.0469 Q426.4063,488.0469 427,487.7813 Q427.5938,487.5 428.2188,486.9219 L428.2188,489.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="445.75" y="488.1543">B</text>
@@ -18,125 +18,125 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="502" y="477.1387">F,FF=F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372" x2="541" y1="500" y2="500"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377" y="506"/>
       <ellipse cx="382" cy="511" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="391" y="514.2104">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="372" x2="541" y1="520.8047" y2="520.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377" y="526.8047"/>
       <ellipse cx="382" cy="531.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="391" y="535.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377" y="539.6094"/>
       <ellipse cx="382" cy="544.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="391" y="547.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372" x2="541" y1="554.4141" y2="554.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377" y="560.4141"/>
       <ellipse cx="382" cy="565.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="391" y="568.6245">f_ : F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377" y="573.2188"/>
       <ellipse cx="382" cy="578.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="391" y="581.4292">ff_ : FF</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3mqqfh92grh)" height="120.0234" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="120" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jhbf44rj4fit)" height="120.0234" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="120" y="288"/>
       <ellipse cx="148.95" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M151.9188,309.6406 Q151.3406,309.9375 150.7,310.0781 Q150.0594,310.2344 149.3563,310.2344 Q146.8563,310.2344 145.5281,308.5938 Q144.2156,306.9375 144.2156,303.8125 Q144.2156,300.6875 145.5281,299.0313 Q146.8563,297.375 149.3563,297.375 Q150.0594,297.375 150.7,297.5313 Q151.3563,297.6875 151.9188,297.9844 L151.9188,300.7031 Q151.2938,300.125 150.7,299.8594 Q150.1063,299.5781 149.4813,299.5781 Q148.1375,299.5781 147.45,300.6563 Q146.7625,301.7188 146.7625,303.8125 Q146.7625,305.9063 147.45,306.9844 Q148.1375,308.0469 149.4813,308.0469 Q150.1063,308.0469 150.7,307.7813 Q151.2938,307.5 151.9188,306.9219 L151.9188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="610" x="166.05" y="308.1543">B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="121" x2="792" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="326"/>
       <ellipse cx="131" cy="331" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="647" x="140" y="334.2104">B((lambda at ../../tests/t00051/t00051.cc:43:18) &amp;&amp; f, (lambda at ../../tests/t00051/t00051.cc:43:27) &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="121" x2="792" y1="340.8047" y2="340.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="346.8047"/>
       <ellipse cx="131" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="140" y="355.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="359.6094"/>
       <ellipse cx="131" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="140" y="367.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="121" x2="792" y1="374.4141" y2="374.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="380.4141"/>
       <ellipse cx="131" cy="385.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="282" x="140" y="388.6245">f_ : (lambda at ../../tests/t00051/t00051.cc:43:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="393.2188"/>
       <ellipse cx="131" cy="398.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="286" x="140" y="401.4292">ff_ : (lambda at ../../tests/t00051/t00051.cc:43:27)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3mqqfh92grh)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="120" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jhbf44rj4fit)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="120" y="129"/>
       <ellipse cx="448.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M451.2188,150.6406 Q450.6406,150.9375 450,151.0781 Q449.3594,151.2344 448.6563,151.2344 Q446.1563,151.2344 444.8281,149.5938 Q443.5156,147.9375 443.5156,144.8125 Q443.5156,141.6875 444.8281,140.0313 Q446.1563,138.375 448.6563,138.375 Q449.3594,138.375 450,138.5313 Q450.6563,138.6875 451.2188,138.9844 L451.2188,141.7031 Q450.5938,141.125 450,140.8594 Q449.4063,140.5781 448.7813,140.5781 Q447.4375,140.5781 446.75,141.6563 Q446.0625,142.7188 446.0625,144.8125 Q446.0625,146.9063 446.75,147.9844 Q447.4375,149.0469 448.7813,149.0469 Q449.4063,149.0469 450,148.7813 Q450.5938,148.5 451.2188,147.9219 L451.2188,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="468.75" y="149.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="121" x2="792" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="167"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="128" y="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="349" x="140" y="175.2104">get_function() : (lambda at ../../tests/t00051/t00051.cc:48:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="179.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="128" y="181.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="140" y="188.0151">start_thread1() : custom_thread1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="192.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="128" y="194.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="140" y="200.8198">start_thread2() : custom_thread2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="126" y="205.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="128" y="207.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="647" x="140" y="213.6245">start_thread3() : B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="121" x2="792" y1="220.2188" y2="220.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3mqqfh92grh)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jhbf44rj4fit)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
       <ellipse cx="166.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M169.2188,29.6406 Q168.6406,29.9375 168,30.0781 Q167.3594,30.2344 166.6563,30.2344 Q164.1563,30.2344 162.8281,28.5938 Q161.5156,26.9375 161.5156,23.8125 Q161.5156,20.6875 162.8281,19.0313 Q164.1563,17.375 166.6563,17.375 Q167.3594,17.375 168,17.5313 Q168.6563,17.6875 169.2188,17.9844 L169.2188,20.7031 Q168.5938,20.125 168,19.8594 Q167.4063,19.5781 166.7813,19.5781 Q165.4375,19.5781 164.75,20.6563 Q164.0625,21.7188 164.0625,23.8125 Q164.0625,25.9063 164.75,26.9844 Q165.4375,28.0469 166.7813,28.0469 Q167.4063,28.0469 168,27.7813 Q168.5938,27.5 169.2188,26.9219 L169.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="186.75" y="28.1543">A::custom_thread1</text>
@@ -145,18 +145,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="421" x="26" y="54.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3mqqfh92grh)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="488.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jhbf44rj4fit)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="488.5" y="8"/>
       <ellipse cx="620.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M623.2188,29.6406 Q622.6406,29.9375 622,30.0781 Q621.3594,30.2344 620.6563,30.2344 Q618.1563,30.2344 616.8281,28.5938 Q615.5156,26.9375 615.5156,23.8125 Q615.5156,20.6875 616.8281,19.0313 Q618.1563,17.375 620.6563,17.375 Q621.3594,17.375 622,17.5313 Q622.6563,17.6875 623.2188,17.9844 L623.2188,20.7031 Q622.5938,20.125 622,19.8594 Q621.4063,19.5781 620.7813,19.5781 Q619.4375,19.5781 618.75,20.6563 Q618.0625,21.7188 618.0625,23.8125 Q618.0625,25.9063 618.75,26.9844 Q619.4375,28.0469 620.7813,28.0469 Q621.4063,28.0469 622,27.7813 Q622.5938,27.5 623.2188,26.9219 L623.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="640.75" y="28.1543">A::custom_thread2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="877.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="494.5" y="46"/>
       <ellipse cx="499.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="508.5" y="54.2104">thread((lambda at ../../tests/t00051/t00051.cc:59:27) &amp;&amp;) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="877.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg
index 9c4e01fc..e2ab365c 100644
--- a/docs/test_cases/t00051_class_mermaid.svg
+++ b/docs/test_cases/t00051_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 945.34375 742" style="max-width: 945.344px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1801.15625 595" style="max-width: 1801.16px; background-color: white;" width="1801.15625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,47 +50,51 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M454.875,517L454.875,521.1666666666666C454.875,525.3333333333334,454.875,533.6666666666666,454.875,542C454.875,550.3333333333334,454.875,558.6666666666666,454.875,562.8333333333334L454.875,567"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M454.875,300L454.875,304.1666666666667C454.875,308.3333333333333,454.875,316.6666666666667,454.875,325C454.875,333.3333333333333,454.875,341.6666666666667,454.875,345.8333333333333L454.875,350"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id3" d="M210.0390625,87L210.0390625,92.66666666666667C210.0390625,98.33333333333333,210.0390625,109.66666666666667,223.0663267801252,121C236.09359106025036,132.33333333333334,262.1481196205008,143.66666666666666,275.17538390062595,149.33333333333334L288.20264818075117,155"/>
-        <path style="fill:none" class="edge-pattern-solid relation" id="id4" d="M699.7109375,87L699.7109375,92.66666666666667C699.7109375,98.33333333333333,699.7109375,109.66666666666667,686.6836732198748,121C673.6564089397497,132.33333333333334,647.6018803794992,143.66666666666666,634.5746160993741,149.33333333333334L621.5473518192489,155"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M410.90625,370L410.90625,374.1666666666667C410.90625,378.3333333333333,410.90625,386.6666666666667,410.90625,395C410.90625,403.3333333333333,410.90625,411.6666666666667,410.90625,415.8333333333333L410.90625,420"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M662.125,140.60172008636218L620.2552083333334,146.83476673863515C578.3854166666666,153.06781339090813,494.6458333333333,165.53390669545408,452.7760416666667,175.93362001439368C410.90625,186.33333333333334,410.90625,194.66666666666666,410.90625,198.83333333333334L410.90625,203"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M1065.8515625,153L1065.8515625,157.16666666666666C1065.8515625,161.33333333333334,1065.8515625,169.66666666666666,1065.8515625,185.33333333333334C1065.8515625,201,1065.8515625,224,1065.8515625,235.5L1065.8515625,247"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M1429.966546474359,153L1450.8926949786326,157.16666666666666C1471.818843482906,161.33333333333334,1513.6711404914531,169.66666666666666,1534.5972889957266,185.33333333333334C1555.5234375,201,1555.5234375,224,1555.5234375,235.5L1555.5234375,247"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
-              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
-              </div>
-            </foreignObject>
-          </g>
-        </g>
-        <g transform="translate(210.0390625, 121)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(699.7109375, 121)" class="edgeLabel">
-          <g transform="translate(-28.46875, -9)" class="label">
-            <foreignObject height="18" width="56.9375">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                 <span class="edgeLabel">
-                  <span class="edgeLabel">[nested]</span>
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
                 </span>
               </div>
             </foreignObject>
@@ -98,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(454.875, 650.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6">
+        <a transform="translate(410.90625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000486675674447050206-0" class="node default clickable">
             <rect height="167" width="200.09375" y="-83.5" x="-100.046875" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="100.046875" x1="-100.046875" class="divider"/>
@@ -142,7 +146,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L6">
+        <a transform="translate(410.90625, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000129489662928342298-1" class="node default clickable">
             <rect height="167" width="805.8125" y="-83.5" x="-402.90625" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="402.90625" x1="-402.90625" class="divider"/>
@@ -186,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L20">
+        <a transform="translate(1065.8515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L20">
           <g title="A" id="classId-C_0001064663612772326174-2" class="node default clickable">
             <rect height="145" width="807.453125" y="-72.5" x="-403.7265625" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="403.7265625" x1="-403.7265625" class="divider"/>
@@ -225,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.0390625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L23">
+        <a transform="translate(1065.8515625, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L23">
           <g title="A##custom_thread1" id="classId-C_0000267762118222214764-3" class="node default clickable">
             <rect height="79" width="404.078125" y="-39.5" x="-202.0390625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
@@ -249,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00051/t00051.cc#L35">
+        <a transform="translate(1555.5234375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00051/t00051.cc#L35">
           <g title="A##custom_thread2" id="classId-C_0000728501319748477470-4" class="node default clickable">
             <rect height="79" width="475.265625" y="-39.5" x="-237.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="237.6328125" x1="-237.6328125" class="divider"/>
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md
index f70437be..8f775e9b 100644
--- a/docs/test_cases/t00052.md
+++ b/docs/test_cases/t00052.md
@@ -398,7 +398,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index 8ae3b728..e8a86c65 100644
--- a/docs/test_cases/t00052_class.svg
+++ b/docs/test_cases/t00052_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="390px" preserveAspectRatio="none" style="width:459px;height:390px;" version="1.1" viewBox="0 0 459 390" width="459px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cijs1mj0kco2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fznfu3n32afei" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
       <ellipse cx="90.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M93.7188,192.6406 Q93.1406,192.9375 92.5,193.0781 Q91.8594,193.2344 91.1563,193.2344 Q88.6563,193.2344 87.3281,191.5938 Q86.0156,189.9375 86.0156,186.8125 Q86.0156,183.6875 87.3281,182.0313 Q88.6563,180.375 91.1563,180.375 Q91.8594,180.375 92.5,180.5313 Q93.1563,180.6875 93.7188,180.9844 L93.7188,183.7031 Q93.0938,183.125 92.5,182.8594 Q91.9063,182.5781 91.2813,182.5781 Q89.9375,182.5781 89.25,183.6563 Q88.5625,184.7188 88.5625,186.8125 Q88.5625,188.9063 89.25,189.9844 Q89.9375,191.0469 91.2813,191.0469 Q91.9063,191.0469 92.5,190.7813 Q93.0938,190.5 93.7188,189.9219 L93.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.25" y="191.1543">A</text>
@@ -21,8 +21,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="26" y="230.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="236.6094" y2="236.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
       <ellipse cx="218.25" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.2188,327.6406 Q220.6406,327.9375 220,328.0781 Q219.3594,328.2344 218.6563,328.2344 Q216.1563,328.2344 214.8281,326.5938 Q213.5156,324.9375 213.5156,321.8125 Q213.5156,318.6875 214.8281,317.0313 Q216.1563,315.375 218.6563,315.375 Q219.3594,315.375 220,315.5313 Q220.6563,315.6875 221.2188,315.9844 L221.2188,318.7031 Q220.5938,318.125 220,317.8594 Q219.4063,317.5781 218.7813,317.5781 Q217.4375,317.5781 216.75,318.6563 Q216.0625,319.7188 216.0625,321.8125 Q216.0625,323.9063 216.75,324.9844 Q217.4375,326.0469 218.7813,326.0469 Q219.4063,326.0469 220,325.7813 Q220.5938,325.5 221.2188,324.9219 L221.2188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="238.75" y="326.1543">B</text>
@@ -30,18 +30,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="303" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="162" y="344"/>
       <ellipse cx="167" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="176" y="352.2104">b(T t) : T</text>
     </a>
     <ellipse cx="167" cy="361.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="176" y="365.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
       <ellipse cx="380.95" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9188,334.1406 Q383.3406,334.4375 382.7,334.5781 Q382.0594,334.7344 381.3563,334.7344 Q378.8563,334.7344 377.5281,333.0938 Q376.2156,331.4375 376.2156,328.3125 Q376.2156,325.1875 377.5281,323.5313 Q378.8563,321.875 381.3563,321.875 Q382.0594,321.875 382.7,322.0313 Q383.3563,322.1875 383.9188,322.4844 L383.9188,325.2031 Q383.2938,324.625 382.7,324.3594 Q382.1063,324.0781 381.4813,324.0781 Q380.1375,324.0781 379.45,325.1563 Q378.7625,326.2188 378.7625,328.3125 Q378.7625,330.4063 379.45,331.4844 Q380.1375,332.5469 381.4813,332.5469 Q382.1063,332.5469 382.7,332.2813 Q383.2938,332 383.9188,331.4219 L383.9188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="400.05" y="332.6543">C</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="358.7104">c&lt;P&gt;(P p) : T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="365.3047" y2="365.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
       <ellipse cx="242" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M244.9688,205.6406 Q244.3906,205.9375 243.75,206.0781 Q243.1094,206.2344 242.4063,206.2344 Q239.9063,206.2344 238.5781,204.5938 Q237.2656,202.9375 237.2656,199.8125 Q237.2656,196.6875 238.5781,195.0313 Q239.9063,193.375 242.4063,193.375 Q243.1094,193.375 243.75,193.5313 Q244.4063,193.6875 244.9688,193.9844 L244.9688,196.7031 Q244.3438,196.125 243.75,195.8594 Q243.1563,195.5781 242.5313,195.5781 Q241.1875,195.5781 240.5,196.6563 Q239.8125,197.7188 239.8125,199.8125 Q239.8125,201.9063 240.5,202.9844 Q241.1875,204.0469 242.5313,204.0469 Q243.1563,204.0469 243.75,203.7813 Q244.3438,203.5 244.9688,202.9219 L244.9688,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="256" y="204.1543">B</text>
@@ -62,8 +62,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="216" y2="216"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
       <ellipse cx="366" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M368.9688,205.6406 Q368.3906,205.9375 367.75,206.0781 Q367.1094,206.2344 366.4063,206.2344 Q363.9063,206.2344 362.5781,204.5938 Q361.2656,202.9375 361.2656,199.8125 Q361.2656,196.6875 362.5781,195.0313 Q363.9063,193.375 366.4063,193.375 Q367.1094,193.375 367.75,193.5313 Q368.4063,193.6875 368.9688,193.9844 L368.9688,196.7031 Q368.3438,196.125 367.75,195.8594 Q367.1563,195.5781 366.5313,195.5781 Q365.1875,195.5781 364.5,196.6563 Q363.8125,197.7188 363.8125,199.8125 Q363.8125,201.9063 364.5,202.9844 Q365.1875,204.0469 366.5313,204.0469 Q367.1563,204.0469 367.75,203.7813 Q368.3438,203.5 368.9688,202.9219 L368.9688,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="380" y="204.1543">C</text>
@@ -72,33 +72,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="216" y2="216"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cijs1mj0kco2)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fznfu3n32afei)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
       <ellipse cx="249.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M252.7188,29.6406 Q252.1406,29.9375 251.5,30.0781 Q250.8594,30.2344 250.1563,30.2344 Q247.6563,30.2344 246.3281,28.5938 Q245.0156,26.9375 245.0156,23.8125 Q245.0156,20.6875 246.3281,19.0313 Q247.6563,17.375 250.1563,17.375 Q250.8594,17.375 251.5,17.5313 Q252.1563,17.6875 252.7188,17.9844 L252.7188,20.7031 Q252.0938,20.125 251.5,19.8594 Q250.9063,19.5781 250.2813,19.5781 Q248.9375,19.5781 248.25,20.6563 Q247.5625,21.7188 247.5625,23.8125 Q247.5625,25.9063 248.25,26.9844 Q248.9375,28.0469 250.2813,28.0469 Q250.9063,28.0469 251.5,27.7813 Q252.0938,27.5 252.7188,26.9219 L252.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="268.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="54"/>
       <ellipse cx="225.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="234.5" y="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="66.8047"/>
       <ellipse cx="225.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="234.5" y="75.0151">b : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="79.6094"/>
       <ellipse cx="225.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="234.5" y="87.8198">c : C&lt;int&gt;</text>
     </a>
     <path d="M252.65,232.17 C249.84,247.09 246.07,267.16 242.51,286.07 " fill="none" id="C_0001043027222809675776-&gt;C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg
index 43421355..2567f37f 100644
--- a/docs/test_cases/t00052_class_mermaid.svg
+++ b/docs/test_cases/t00052_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 541.703125 459" style="max-width: 541.703px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 541.703125 459" style="max-width: 541.703px; background-color: white;" width="541.703125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -57,20 +57,24 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M311.4453125,92.1071072865623L336.3919270833333,104.25592273880191C361.3385416666667,116.40473819104153,411.2317708333333,140.70236909552077,436.1783854166667,162.1845178810937C461.125,183.66666666666666,461.125,202.33333333333334,461.125,211.66666666666666L461.125,221"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -110,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L6">
+        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L6">
           <g title="A" id="classId-C_0002200853067459698271-0" class="node default clickable">
             <rect height="101" width="174.625" y="-50.5" x="-87.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.3125" x1="-87.3125" class="divider"/>
@@ -139,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001737293776724790064-1" class="node default clickable">
             <rect height="101" width="147.046875" y="-50.5" x="-73.5234375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
@@ -168,7 +172,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000687756639884832524-2" class="node default clickable">
             <rect height="79" width="145.15625" y="-39.5" x="-72.578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.578125" x1="-72.578125" class="divider"/>
@@ -192,7 +196,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001043027222809675776-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -211,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000492968837554438176-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -230,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00052/t00052.cc#L29">
+        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00052/t00052.cc#L29">
           <g title="R" id="classId-C_0001157978668683299226-5" class="node default clickable">
             <rect height="123" width="92.84375" y="-61.5" x="-46.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="46.421875" x1="-46.421875" class="divider"/>
diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md
index 1bd1de0d..33e2d666 100644
--- a/docs/test_cases/t00053.md
+++ b/docs/test_cases/t00053.md
@@ -420,7 +420,7 @@ enum class j { jjj };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index 46a522a6..9db7e650 100644
--- a/docs/test_cases/t00053_class.svg
+++ b/docs/test_cases/t00053_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="340px" preserveAspectRatio="none" style="width:698px;height:340px;" version="1.1" viewBox="0 0 698 340" width="698px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5tj2pvpy8mp7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f16i5t1p36znqh" 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"/>
@@ -9,72 +9,72 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
       <ellipse cx="249" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,68.1406 Q251.3906,68.4375 250.75,68.5781 Q250.1094,68.7344 249.4063,68.7344 Q246.9063,68.7344 245.5781,67.0938 Q244.2656,65.4375 244.2656,62.3125 Q244.2656,59.1875 245.5781,57.5313 Q246.9063,55.875 249.4063,55.875 Q250.1094,55.875 250.75,56.0313 Q251.4063,56.1875 251.9688,56.4844 L251.9688,59.2031 Q251.3438,58.625 250.75,58.3594 Q250.1563,58.0781 249.5313,58.0781 Q248.1875,58.0781 247.5,59.1563 Q246.8125,60.2188 246.8125,62.3125 Q246.8125,64.4063 247.5,65.4844 Q248.1875,66.5469 249.5313,66.5469 Q250.1563,66.5469 250.75,66.2813 Q251.3438,66 251.9688,65.4219 L251.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="66.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
       <ellipse cx="324" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M326.9688,68.1406 Q326.3906,68.4375 325.75,68.5781 Q325.1094,68.7344 324.4063,68.7344 Q321.9063,68.7344 320.5781,67.0938 Q319.2656,65.4375 319.2656,62.3125 Q319.2656,59.1875 320.5781,57.5313 Q321.9063,55.875 324.4063,55.875 Q325.1094,55.875 325.75,56.0313 Q326.4063,56.1875 326.9688,56.4844 L326.9688,59.2031 Q326.3438,58.625 325.75,58.3594 Q325.1563,58.0781 324.5313,58.0781 Q323.1875,58.0781 322.5,59.1563 Q321.8125,60.2188 321.8125,62.3125 Q321.8125,64.4063 322.5,65.4844 Q323.1875,66.5469 324.5313,66.5469 Q325.1563,66.5469 325.75,66.2813 Q326.3438,66 326.9688,65.4219 L326.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338" y="66.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
       <ellipse cx="249" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,182.6406 Q251.3906,182.9375 250.75,183.0781 Q250.1094,183.2344 249.4063,183.2344 Q246.9063,183.2344 245.5781,181.5938 Q244.2656,179.9375 244.2656,176.8125 Q244.2656,173.6875 245.5781,172.0313 Q246.9063,170.375 249.4063,170.375 Q250.1094,170.375 250.75,170.5313 Q251.4063,170.6875 251.9688,170.9844 L251.9688,173.7031 Q251.3438,173.125 250.75,172.8594 Q250.1563,172.5781 249.5313,172.5781 Q248.1875,172.5781 247.5,173.6563 Q246.8125,174.7188 246.8125,176.8125 Q246.8125,178.9063 247.5,179.9844 Q248.1875,181.0469 249.5313,181.0469 Q250.1563,181.0469 250.75,180.7813 Q251.3438,180.5 251.9688,179.9219 L251.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="181.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
       <ellipse cx="324.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.4688,182.6406 Q326.8906,182.9375 326.25,183.0781 Q325.6094,183.2344 324.9063,183.2344 Q322.4063,183.2344 321.0781,181.5938 Q319.7656,179.9375 319.7656,176.8125 Q319.7656,173.6875 321.0781,172.0313 Q322.4063,170.375 324.9063,170.375 Q325.6094,170.375 326.25,170.5313 Q326.9063,170.6875 327.4688,170.9844 L327.4688,173.7031 Q326.8438,173.125 326.25,172.8594 Q325.6563,172.5781 325.0313,172.5781 Q323.6875,172.5781 323,173.6563 Q322.3125,174.7188 322.3125,176.8125 Q322.3125,178.9063 323,179.9844 Q323.6875,181.0469 325.0313,181.0469 Q325.6563,181.0469 326.25,180.7813 Q326.8438,180.5 327.4688,179.9219 L327.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="338.5" y="181.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
       <ellipse cx="420" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,68.1406 Q422.3906,68.4375 421.75,68.5781 Q421.1094,68.7344 420.4063,68.7344 Q417.9063,68.7344 416.5781,67.0938 Q415.2656,65.4375 415.2656,62.3125 Q415.2656,59.1875 416.5781,57.5313 Q417.9063,55.875 420.4063,55.875 Q421.1094,55.875 421.75,56.0313 Q422.4063,56.1875 422.9688,56.4844 L422.9688,59.2031 Q422.3438,58.625 421.75,58.3594 Q421.1563,58.0781 420.5313,58.0781 Q419.1875,58.0781 418.5,59.1563 Q417.8125,60.2188 417.8125,62.3125 Q417.8125,64.4063 418.5,65.4844 Q419.1875,66.5469 420.5313,66.5469 Q421.1563,66.5469 421.75,66.2813 Q422.3438,66 422.9688,65.4219 L422.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="66.6543">a</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
       <ellipse cx="495.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.4688,68.1406 Q497.8906,68.4375 497.25,68.5781 Q496.6094,68.7344 495.9063,68.7344 Q493.4063,68.7344 492.0781,67.0938 Q490.7656,65.4375 490.7656,62.3125 Q490.7656,59.1875 492.0781,57.5313 Q493.4063,55.875 495.9063,55.875 Q496.6094,55.875 497.25,56.0313 Q497.9063,56.1875 498.4688,56.4844 L498.4688,59.2031 Q497.8438,58.625 497.25,58.3594 Q496.6563,58.0781 496.0313,58.0781 Q494.6875,58.0781 494,59.1563 Q493.3125,60.2188 493.3125,62.3125 Q493.3125,64.4063 494,65.4844 Q494.6875,66.5469 496.0313,66.5469 Q496.6563,66.5469 497.25,66.2813 Q497.8438,66 498.4688,65.4219 L498.4688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="509.5" y="66.6543">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
       <ellipse cx="420" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,182.6406 Q422.3906,182.9375 421.75,183.0781 Q421.1094,183.2344 420.4063,183.2344 Q417.9063,183.2344 416.5781,181.5938 Q415.2656,179.9375 415.2656,176.8125 Q415.2656,173.6875 416.5781,172.0313 Q417.9063,170.375 420.4063,170.375 Q421.1094,170.375 421.75,170.5313 Q422.4063,170.6875 422.9688,170.9844 L422.9688,173.7031 Q422.3438,173.125 421.75,172.8594 Q421.1563,172.5781 420.5313,172.5781 Q419.1875,172.5781 418.5,173.6563 Q417.8125,174.7188 417.8125,176.8125 Q417.8125,178.9063 418.5,179.9844 Q419.1875,181.0469 420.5313,181.0469 Q421.1563,181.0469 421.75,180.7813 Q422.3438,180.5 422.9688,179.9219 L422.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="181.1543">e</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
       <ellipse cx="495" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.9688,182.6406 Q497.3906,182.9375 496.75,183.0781 Q496.1094,183.2344 495.4063,183.2344 Q492.9063,183.2344 491.5781,181.5938 Q490.2656,179.9375 490.2656,176.8125 Q490.2656,173.6875 491.5781,172.0313 Q492.9063,170.375 495.4063,170.375 Q496.1094,170.375 496.75,170.5313 Q497.4063,170.6875 497.9688,170.9844 L497.9688,173.7031 Q497.3438,173.125 496.75,172.8594 Q496.1563,172.5781 495.5313,172.5781 Q494.1875,172.5781 493.5,173.6563 Q492.8125,174.7188 492.8125,176.8125 Q492.8125,178.9063 493.5,179.9844 Q494.1875,181.0469 495.5313,181.0469 Q496.1563,181.0469 496.75,180.7813 Q497.3438,180.5 497.9688,179.9219 L497.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="509" y="181.1543">f</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
       <ellipse cx="662" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M666.1094,62 L658.3906,62 L658.3906,49.6094 L666.1094,49.6094 L666.1094,51.7656 L660.8438,51.7656 L660.8438,54.4375 L665.6094,54.4375 L665.6094,56.5938 L660.8438,56.5938 L660.8438,59.8438 L666.1094,59.8438 L666.1094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="676" y="60.1543">h</text>
@@ -82,8 +82,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="653" y="86.2104">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
       <ellipse cx="591.5" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M595.6094,62 L587.8906,62 L587.8906,49.6094 L595.6094,49.6094 L595.6094,51.7656 L590.3438,51.7656 L590.3438,54.4375 L595.1094,54.4375 L595.1094,56.5938 L590.3438,56.5938 L590.3438,59.8438 L595.6094,59.8438 L595.6094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="605.5" y="60.1543">j</text>
@@ -91,56 +91,56 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="582.5" y="86.2104">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
       <ellipse cx="21" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,68.1406 Q23.3906,68.4375 22.75,68.5781 Q22.1094,68.7344 21.4063,68.7344 Q18.9063,68.7344 17.5781,67.0938 Q16.2656,65.4375 16.2656,62.3125 Q16.2656,59.1875 17.5781,57.5313 Q18.9063,55.875 21.4063,55.875 Q22.1094,55.875 22.75,56.0313 Q23.4063,56.1875 23.9688,56.4844 L23.9688,59.2031 Q23.3438,58.625 22.75,58.3594 Q22.1563,58.0781 21.5313,58.0781 Q20.1875,58.0781 19.5,59.1563 Q18.8125,60.2188 18.8125,62.3125 Q18.8125,64.4063 19.5,65.4844 Q20.1875,66.5469 21.5313,66.5469 Q22.1563,66.5469 22.75,66.2813 Q23.3438,66 23.9688,65.4219 L23.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="66.6543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
       <ellipse cx="96" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,68.1406 Q98.3906,68.4375 97.75,68.5781 Q97.1094,68.7344 96.4063,68.7344 Q93.9063,68.7344 92.5781,67.0938 Q91.2656,65.4375 91.2656,62.3125 Q91.2656,59.1875 92.5781,57.5313 Q93.9063,55.875 96.4063,55.875 Q97.1094,55.875 97.75,56.0313 Q98.4063,56.1875 98.9688,56.4844 L98.9688,59.2031 Q98.3438,58.625 97.75,58.3594 Q97.1563,58.0781 96.5313,58.0781 Q95.1875,58.0781 94.5,59.1563 Q93.8125,60.2188 93.8125,62.3125 Q93.8125,64.4063 94.5,65.4844 Q95.1875,66.5469 96.5313,66.5469 Q97.1563,66.5469 97.75,66.2813 Q98.3438,66 98.9688,65.4219 L98.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="66.6543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
       <ellipse cx="171" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,68.1406 Q173.3906,68.4375 172.75,68.5781 Q172.1094,68.7344 171.4063,68.7344 Q168.9063,68.7344 167.5781,67.0938 Q166.2656,65.4375 166.2656,62.3125 Q166.2656,59.1875 167.5781,57.5313 Q168.9063,55.875 171.4063,55.875 Q172.1094,55.875 172.75,56.0313 Q173.4063,56.1875 173.9688,56.4844 L173.9688,59.2031 Q173.3438,58.625 172.75,58.3594 Q172.1563,58.0781 171.5313,58.0781 Q170.1875,58.0781 169.5,59.1563 Q168.8125,60.2188 168.8125,62.3125 Q168.8125,64.4063 169.5,65.4844 Q170.1875,66.5469 171.5313,66.5469 Q172.1563,66.5469 172.75,66.2813 Q173.3438,66 173.9688,65.4219 L173.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="66.6543">g</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
       <ellipse cx="21" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,182.6406 Q23.3906,182.9375 22.75,183.0781 Q22.1094,183.2344 21.4063,183.2344 Q18.9063,183.2344 17.5781,181.5938 Q16.2656,179.9375 16.2656,176.8125 Q16.2656,173.6875 17.5781,172.0313 Q18.9063,170.375 21.4063,170.375 Q22.1094,170.375 22.75,170.5313 Q23.4063,170.6875 23.9688,170.9844 L23.9688,173.7031 Q23.3438,173.125 22.75,172.8594 Q22.1563,172.5781 21.5313,172.5781 Q20.1875,172.5781 19.5,173.6563 Q18.8125,174.7188 18.8125,176.8125 Q18.8125,178.9063 19.5,179.9844 Q20.1875,181.0469 21.5313,181.0469 Q22.1563,181.0469 22.75,180.7813 Q23.3438,180.5 23.9688,179.9219 L23.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="181.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
       <ellipse cx="96.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,182.6406 Q98.8906,182.9375 98.25,183.0781 Q97.6094,183.2344 96.9063,183.2344 Q94.4063,183.2344 93.0781,181.5938 Q91.7656,179.9375 91.7656,176.8125 Q91.7656,173.6875 93.0781,172.0313 Q94.4063,170.375 96.9063,170.375 Q97.6094,170.375 98.25,170.5313 Q98.9063,170.6875 99.4688,170.9844 L99.4688,173.7031 Q98.8438,173.125 98.25,172.8594 Q97.6563,172.5781 97.0313,172.5781 Q95.6875,172.5781 95,173.6563 Q94.3125,174.7188 94.3125,176.8125 Q94.3125,178.9063 95,179.9844 Q95.6875,181.0469 97.0313,181.0469 Q97.6563,181.0469 98.25,180.7813 Q98.8438,180.5 99.4688,179.9219 L99.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="110.5" y="181.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
       <ellipse cx="172.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M175.4688,182.6406 Q174.8906,182.9375 174.25,183.0781 Q173.6094,183.2344 172.9063,183.2344 Q170.4063,183.2344 169.0781,181.5938 Q167.7656,179.9375 167.7656,176.8125 Q167.7656,173.6875 169.0781,172.0313 Q170.4063,170.375 172.9063,170.375 Q173.6094,170.375 174.25,170.5313 Q174.9063,170.6875 175.4688,170.9844 L175.4688,173.7031 Q174.8438,173.125 174.25,172.8594 Q173.6563,172.5781 173.0313,172.5781 Q171.6875,172.5781 171,173.6563 Q170.3125,174.7188 170.3125,176.8125 Q170.3125,178.9063 171,179.9844 Q171.6875,181.0469 173.0313,181.0469 Q173.6563,181.0469 174.25,180.7813 Q174.8438,180.5 175.4688,179.9219 L175.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="181.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5tj2pvpy8mp7)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f16i5t1p36znqh)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
       <ellipse cx="23.5" cy="285" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M27.6094,291 L19.8906,291 L19.8906,278.6094 L27.6094,278.6094 L27.6094,280.7656 L22.3438,280.7656 L22.3438,283.4375 L27.1094,283.4375 L27.1094,285.5938 L22.3438,285.5938 L22.3438,288.8438 L27.6094,288.8438 L27.6094,291 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="37.5" y="289.1543">i</text>
diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg
index 36915043..fd91ee76 100644
--- a/docs/test_cases/t00053_class_mermaid.svg
+++ b/docs/test_cases/t00053_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1537.09375 117" style="max-width: 1537.09px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1531.796875 117" style="max-width: 1531.8px; background-color: white;" width="1531.796875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L4">
           <g title="b" id="classId-C_0001376344645244260547-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L6">
+        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L6">
           <g title="d" id="classId-C_0001264455164862224089-1" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L9">
+        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L9">
           <g title="g" id="classId-C_0000200227126708762001-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L12">
+        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L12">
           <g title="B" id="classId-C_0000876623970071162908-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L14">
+        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L14">
           <g title="D" id="classId-C_0000470228045297785394-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L17">
+        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L17">
           <g title="G" id="classId-C_0001031614323468823578-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -166,15 +166,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(524.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L20">
+        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L20">
           <g title="i" id="classId-C_0001473214620883985930-6" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -2.2265625, -21)" height="18" width="4.453125" class="classTitle">
@@ -182,7 +182,7 @@
                   <span class="nodeLabel">i</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="10.671875">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="10.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">iii</span>
                 </div>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(649.71875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L11">
+        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L11">
           <g title="A" id="classId-C_0000322642841130459425-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -209,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(726.28125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L13">
+        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L13">
           <g title="C" id="classId-C_0001248473990784124468-8" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -228,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(802.3984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L15">
+        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L15">
           <g title="E" id="classId-C_0001038384764221361257-9" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -247,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(877.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L16">
+        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L16">
           <g title="F" id="classId-C_0000530253748811039667-10" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -266,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(951.96875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L3">
+        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L3">
           <g title="a" id="classId-C_0000347629837292519144-11" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -285,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1025.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L5">
+        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L5">
           <g title="c" id="classId-C_0000504463801094568803-12" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1099.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L7">
+        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L7">
           <g title="e" id="classId-C_0000907921963776939609-13" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1171.8984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L8">
+        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L8">
           <g title="f" id="classId-C_0001421289128664274084-14" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -342,15 +342,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1293.8203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L19">
+        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L19">
           <g title="h" id="classId-C_0000190978367074032185-15" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -4.890625, -21)" height="18" width="9.78125" class="classTitle">
@@ -358,7 +358,7 @@
                   <span class="nodeLabel">h</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="26.703125">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="26.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">hhh</span>
                 </div>
@@ -366,15 +366,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1467.3359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00053/t00053.cc#L21">
+        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00053/t00053.cc#L21">
           <g title="j" id="classId-C_0000965083605473661435-16" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -2.2265625, -21)" height="18" width="4.453125" class="classTitle">
@@ -382,7 +382,7 @@
                   <span class="nodeLabel">j</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="10.671875">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="10.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">jjj</span>
                 </div>
diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md
index 313708e7..31de9163 100644
--- a/docs/test_cases/t00054.md
+++ b/docs/test_cases/t00054.md
@@ -462,7 +462,7 @@ enum class j { jjj };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index 73f9a81b..48d3893c 100644
--- a/docs/test_cases/t00054_class.svg
+++ b/docs/test_cases/t00054_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="380px" preserveAspectRatio="none" style="width:1774px;height:380px;" version="1.1" viewBox="0 0 1774 380" width="1774px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mlxq25qlphz2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fitq6tsxe8oje" 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"/>
@@ -9,28 +9,28 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1mlxq25qlphz2)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fitq6tsxe8oje)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="77.2969" y2="77.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="69.9951">detail</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mlxq25qlphz2)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fitq6tsxe8oje)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1139" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1077" y="38.9951">detail2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mlxq25qlphz2)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fitq6tsxe8oje)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1531" x2="1597" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1535" y="81.9951">detail3</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mlxq25qlphz2)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fitq6tsxe8oje)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="88" y1="76.2969" y2="76.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="26" y="68.9951">detail4</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
       <ellipse cx="738" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M740.9688,147.6406 Q740.3906,147.9375 739.75,148.0781 Q739.1094,148.2344 738.4063,148.2344 Q735.9063,148.2344 734.5781,146.5938 Q733.2656,144.9375 733.2656,141.8125 Q733.2656,138.6875 734.5781,137.0313 Q735.9063,135.375 738.4063,135.375 Q739.1094,135.375 739.75,135.5313 Q740.4063,135.6875 740.9688,135.9844 L740.9688,138.7031 Q740.3438,138.125 739.75,137.8594 Q739.1563,137.5781 738.5313,137.5781 Q737.1875,137.5781 736.5,138.6563 Q735.8125,139.7188 735.8125,141.8125 Q735.8125,143.9063 736.5,144.9844 Q737.1875,146.0469 738.5313,146.0469 Q739.1563,146.0469 739.75,145.7813 Q740.3438,145.5 740.9688,144.9219 L740.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="752" y="146.1543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
       <ellipse cx="984" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M986.9688,135.6406 Q986.3906,135.9375 985.75,136.0781 Q985.1094,136.2344 984.4063,136.2344 Q981.9063,136.2344 980.5781,134.5938 Q979.2656,132.9375 979.2656,129.8125 Q979.2656,126.6875 980.5781,125.0313 Q981.9063,123.375 984.4063,123.375 Q985.1094,123.375 985.75,123.5313 Q986.4063,123.6875 986.9688,123.9844 L986.9688,126.7031 Q986.3438,126.125 985.75,125.8594 Q985.1563,125.5781 984.5313,125.5781 Q983.1875,125.5781 982.5,126.6563 Q981.8125,127.7188 981.8125,129.8125 Q981.8125,131.9063 982.5,132.9844 Q983.1875,134.0469 984.5313,134.0469 Q985.1563,134.0469 985.75,133.7813 Q986.3438,133.5 986.9688,132.9219 L986.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="134.1543">a</text>
@@ -40,8 +40,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
       <ellipse cx="888.5" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M891.4688,135.6406 Q890.8906,135.9375 890.25,136.0781 Q889.6094,136.2344 888.9063,136.2344 Q886.4063,136.2344 885.0781,134.5938 Q883.7656,132.9375 883.7656,129.8125 Q883.7656,126.6875 885.0781,125.0313 Q886.4063,123.375 888.9063,123.375 Q889.6094,123.375 890.25,123.5313 Q890.9063,123.6875 891.4688,123.9844 L891.4688,126.7031 Q890.8438,126.125 890.25,125.8594 Q889.6563,125.5781 889.0313,125.5781 Q887.6875,125.5781 887,126.6563 Q886.3125,127.7188 886.3125,129.8125 Q886.3125,131.9063 887,132.9844 Q887.6875,134.0469 889.0313,134.0469 Q889.6563,134.0469 890.25,133.7813 Q890.8438,133.5 891.4688,132.9219 L891.4688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="134.1543">c</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
       <ellipse cx="813" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.9688,135.6406 Q815.3906,135.9375 814.75,136.0781 Q814.1094,136.2344 813.4063,136.2344 Q810.9063,136.2344 809.5781,134.5938 Q808.2656,132.9375 808.2656,129.8125 Q808.2656,126.6875 809.5781,125.0313 Q810.9063,123.375 813.4063,123.375 Q814.1094,123.375 814.75,123.5313 Q815.4063,123.6875 815.9688,123.9844 L815.9688,126.7031 Q815.3438,126.125 814.75,125.8594 Q814.1563,125.5781 813.5313,125.5781 Q812.1875,125.5781 811.5,126.6563 Q810.8125,127.7188 810.8125,129.8125 Q810.8125,131.9063 811.5,132.9844 Q812.1875,134.0469 813.5313,134.0469 Q814.1563,134.0469 814.75,133.7813 Q815.3438,133.5 815.9688,132.9219 L815.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="134.1543">e</text>
@@ -62,40 +62,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
       <ellipse cx="1224" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1226.9688,147.6406 Q1226.3906,147.9375 1225.75,148.0781 Q1225.1094,148.2344 1224.4063,148.2344 Q1221.9063,148.2344 1220.5781,146.5938 Q1219.2656,144.9375 1219.2656,141.8125 Q1219.2656,138.6875 1220.5781,137.0313 Q1221.9063,135.375 1224.4063,135.375 Q1225.1094,135.375 1225.75,135.5313 Q1226.4063,135.6875 1226.9688,135.9844 L1226.9688,138.7031 Q1226.3438,138.125 1225.75,137.8594 Q1225.1563,137.5781 1224.5313,137.5781 Q1223.1875,137.5781 1222.5,138.6563 Q1221.8125,139.7188 1221.8125,141.8125 Q1221.8125,143.9063 1222.5,144.9844 Q1223.1875,146.0469 1224.5313,146.0469 Q1225.1563,146.0469 1225.75,145.7813 Q1226.3438,145.5 1226.9688,144.9219 L1226.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1238" y="146.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
       <ellipse cx="1149.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1152.4688,147.6406 Q1151.8906,147.9375 1151.25,148.0781 Q1150.6094,148.2344 1149.9063,148.2344 Q1147.4063,148.2344 1146.0781,146.5938 Q1144.7656,144.9375 1144.7656,141.8125 Q1144.7656,138.6875 1146.0781,137.0313 Q1147.4063,135.375 1149.9063,135.375 Q1150.6094,135.375 1151.25,135.5313 Q1151.9063,135.6875 1152.4688,135.9844 L1152.4688,138.7031 Q1151.8438,138.125 1151.25,137.8594 Q1150.6563,137.5781 1150.0313,137.5781 Q1148.6875,137.5781 1148,138.6563 Q1147.3125,139.7188 1147.3125,141.8125 Q1147.3125,143.9063 1148,144.9844 Q1148.6875,146.0469 1150.0313,146.0469 Q1150.6563,146.0469 1151.25,145.7813 Q1151.8438,145.5 1152.4688,144.9219 L1152.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1163.5" y="146.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
       <ellipse cx="1661.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1664.4688,147.6406 Q1663.8906,147.9375 1663.25,148.0781 Q1662.6094,148.2344 1661.9063,148.2344 Q1659.4063,148.2344 1658.0781,146.5938 Q1656.7656,144.9375 1656.7656,141.8125 Q1656.7656,138.6875 1658.0781,137.0313 Q1659.4063,135.375 1661.9063,135.375 Q1662.6094,135.375 1663.25,135.5313 Q1663.9063,135.6875 1664.4688,135.9844 L1664.4688,138.7031 Q1663.8438,138.125 1663.25,137.8594 Q1662.6563,137.5781 1662.0313,137.5781 Q1660.6875,137.5781 1660,138.6563 Q1659.3125,139.7188 1659.3125,141.8125 Q1659.3125,143.9063 1660,144.9844 Q1660.6875,146.0469 1662.0313,146.0469 Q1662.6563,146.0469 1663.25,145.7813 Q1663.8438,145.5 1664.4688,144.9219 L1664.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1675.5" y="146.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
       <ellipse cx="1586" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1588.9688,147.6406 Q1588.3906,147.9375 1587.75,148.0781 Q1587.1094,148.2344 1586.4063,148.2344 Q1583.9063,148.2344 1582.5781,146.5938 Q1581.2656,144.9375 1581.2656,141.8125 Q1581.2656,138.6875 1582.5781,137.0313 Q1583.9063,135.375 1586.4063,135.375 Q1587.1094,135.375 1587.75,135.5313 Q1588.4063,135.6875 1588.9688,135.9844 L1588.9688,138.7031 Q1588.3438,138.125 1587.75,137.8594 Q1587.1563,137.5781 1586.5313,137.5781 Q1585.1875,137.5781 1584.5,138.6563 Q1583.8125,139.7188 1583.8125,141.8125 Q1583.8125,143.9063 1584.5,144.9844 Q1585.1875,146.0469 1586.5313,146.0469 Q1587.1563,146.0469 1587.75,145.7813 Q1588.3438,145.5 1588.9688,144.9219 L1588.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1600" y="146.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
       <ellipse cx="1466" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1468.9688,139.6406 Q1468.3906,139.9375 1467.75,140.0781 Q1467.1094,140.2344 1466.4063,140.2344 Q1463.9063,140.2344 1462.5781,138.5938 Q1461.2656,136.9375 1461.2656,133.8125 Q1461.2656,130.6875 1462.5781,129.0313 Q1463.9063,127.375 1466.4063,127.375 Q1467.1094,127.375 1467.75,127.5313 Q1468.4063,127.6875 1468.9688,127.9844 L1468.9688,130.7031 Q1468.3438,130.125 1467.75,129.8594 Q1467.1563,129.5781 1466.5313,129.5781 Q1465.1875,129.5781 1464.5,130.6563 Q1463.8125,131.7188 1463.8125,133.8125 Q1463.8125,135.9063 1464.5,136.9844 Q1465.1875,138.0469 1466.5313,138.0469 Q1467.1563,138.0469 1467.75,137.7813 Q1468.3438,137.5 1468.9688,136.9219 L1468.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="138.1543">A</text>
@@ -104,8 +104,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
       <ellipse cx="1391" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1393.9688,139.6406 Q1393.3906,139.9375 1392.75,140.0781 Q1392.1094,140.2344 1391.4063,140.2344 Q1388.9063,140.2344 1387.5781,138.5938 Q1386.2656,136.9375 1386.2656,133.8125 Q1386.2656,130.6875 1387.5781,129.0313 Q1388.9063,127.375 1391.4063,127.375 Q1392.1094,127.375 1392.75,127.5313 Q1393.4063,127.6875 1393.9688,127.9844 L1393.9688,130.7031 Q1393.3438,130.125 1392.75,129.8594 Q1392.1563,129.5781 1391.5313,129.5781 Q1390.1875,129.5781 1389.5,130.6563 Q1388.8125,131.7188 1388.8125,133.8125 Q1388.8125,135.9063 1389.5,136.9844 Q1390.1875,138.0469 1391.5313,138.0469 Q1392.1563,138.0469 1392.75,137.7813 Q1393.3438,137.5 1393.9688,136.9219 L1393.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="138.1543">B</text>
@@ -114,8 +114,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
       <ellipse cx="1299" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1301.9688,139.6406 Q1301.3906,139.9375 1300.75,140.0781 Q1300.1094,140.2344 1299.4063,140.2344 Q1296.9063,140.2344 1295.5781,138.5938 Q1294.2656,136.9375 1294.2656,133.8125 Q1294.2656,130.6875 1295.5781,129.0313 Q1296.9063,127.375 1299.4063,127.375 Q1300.1094,127.375 1300.75,127.5313 Q1301.4063,127.6875 1301.9688,127.9844 L1301.9688,130.7031 Q1301.3438,130.125 1300.75,129.8594 Q1300.1563,129.5781 1299.5313,129.5781 Q1298.1875,129.5781 1297.5,130.6563 Q1296.8125,131.7188 1296.8125,133.8125 Q1296.8125,135.9063 1297.5,136.9844 Q1298.1875,138.0469 1299.5313,138.0469 Q1300.1563,138.0469 1300.75,137.7813 Q1301.3438,137.5 1301.9688,136.9219 L1301.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="138.1543">f</text>
@@ -124,8 +124,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
       <ellipse cx="310.5" cy="138" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.4688,143.6406 Q312.8906,143.9375 312.25,144.0781 Q311.6094,144.2344 310.9063,144.2344 Q308.4063,144.2344 307.0781,142.5938 Q305.7656,140.9375 305.7656,137.8125 Q305.7656,134.6875 307.0781,133.0313 Q308.4063,131.375 310.9063,131.375 Q311.6094,131.375 312.25,131.5313 Q312.9063,131.6875 313.4688,131.9844 L313.4688,134.7031 Q312.8438,134.125 312.25,133.8594 Q311.6563,133.5781 311.0313,133.5781 Q309.6875,133.5781 309,134.6563 Q308.3125,135.7188 308.3125,137.8125 Q308.3125,139.9063 309,140.9844 Q309.6875,142.0469 311.0313,142.0469 Q311.6563,142.0469 312.25,141.7813 Q312.8438,141.5 313.4688,140.9219 L313.4688,143.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="142.1543">G</text>
@@ -133,8 +133,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
       <ellipse cx="143" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M147.1094,135 L139.3906,135 L139.3906,122.6094 L147.1094,122.6094 L147.1094,124.7656 L141.8438,124.7656 L141.8438,127.4375 L146.6094,127.4375 L146.6094,129.5938 L141.8438,129.5938 L141.8438,132.8438 L147.1094,132.8438 L147.1094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157" y="133.1543">h</text>
@@ -143,8 +143,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="172.0151">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
       <ellipse cx="218.5" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.6094,135 L214.8906,135 L214.8906,122.6094 L222.6094,122.6094 L222.6094,124.7656 L217.3438,124.7656 L217.3438,127.4375 L222.1094,127.4375 L222.1094,129.5938 L217.3438,129.5938 L217.3438,132.8438 L222.6094,132.8438 L222.6094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="232.5" y="133.1543">i</text>
@@ -153,8 +153,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="172.0151">iii</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
       <ellipse cx="145.5" cy="270" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.6094,276 L141.8906,276 L141.8906,263.6094 L149.6094,263.6094 L149.6094,265.7656 L144.3438,265.7656 L144.3438,268.4375 L149.1094,268.4375 L149.1094,270.5938 L144.3438,270.5938 L144.3438,273.8438 L149.6094,273.8438 L149.6094,276 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="159.5" y="274.1543">j</text>
@@ -163,16 +163,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="313.0151">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="319.6094" y2="319.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
       <ellipse cx="588" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M590.9688,147.6406 Q590.3906,147.9375 589.75,148.0781 Q589.1094,148.2344 588.4063,148.2344 Q585.9063,148.2344 584.5781,146.5938 Q583.2656,144.9375 583.2656,141.8125 Q583.2656,138.6875 584.5781,137.0313 Q585.9063,135.375 588.4063,135.375 Q589.1094,135.375 589.75,135.5313 Q590.4063,135.6875 590.9688,135.9844 L590.9688,138.7031 Q590.3438,138.125 589.75,137.8594 Q589.1563,137.5781 588.5313,137.5781 Q587.1875,137.5781 586.5,138.6563 Q585.8125,139.7188 585.8125,141.8125 Q585.8125,143.9063 586.5,144.9844 Q587.1875,146.0469 588.5313,146.0469 Q589.1563,146.0469 589.75,145.7813 Q590.3438,145.5 590.9688,144.9219 L590.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="602" y="146.1543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mlxq25qlphz2)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fitq6tsxe8oje)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
       <ellipse cx="663" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M665.9688,147.6406 Q665.3906,147.9375 664.75,148.0781 Q664.1094,148.2344 663.4063,148.2344 Q660.9063,148.2344 659.5781,146.5938 Q658.2656,144.9375 658.2656,141.8125 Q658.2656,138.6875 659.5781,137.0313 Q660.9063,135.375 663.4063,135.375 Q664.1094,135.375 664.75,135.5313 Q665.4063,135.6875 665.9688,135.9844 L665.9688,138.7031 Q665.3438,138.125 664.75,137.8594 Q664.1563,137.5781 663.5313,137.5781 Q662.1875,137.5781 661.5,138.6563 Q660.8125,139.7188 660.8125,141.8125 Q660.8125,143.9063 661.5,144.9844 Q662.1875,146.0469 663.5313,146.0469 Q664.1563,146.0469 664.75,145.7813 Q665.3438,145.5 665.9688,144.9219 L665.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677" y="146.1543">g</text>
diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg
index 10857902..d7448a01 100644
--- a/docs/test_cases/t00054_class_mermaid.svg
+++ b/docs/test_cases/t00054_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2062.46875 117" style="max-width: 2062.47px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2057.171875 117" style="max-width: 2057.17px; background-color: white;" width="2057.171875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L4">
           <g title="b" id="classId-C_0000252416999805673718-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L8">
+        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L8">
           <g title="d" id="classId-C_0001569559620782547158-1" class="node default clickable">
             <rect height="57" width="77.21875" y="-28.5" x="-38.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.609375" x1="-38.609375" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L12">
+        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L12">
           <g title="g" id="classId-C_0000595494794840378320-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L18">
+        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L18">
           <g title="C" id="classId-C_0000540054955081677892-3" class="node default clickable">
             <rect height="57" width="87.90625" y="-28.5" x="-43.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.953125" x1="-43.953125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L23">
+        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L23">
           <g title="F" id="classId-C_0000446694692150903211-4" class="node default clickable">
             <rect height="57" width="86.125" y="-28.5" x="-43.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.0625" x1="-43.0625" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L14">
+        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L14">
           <g title="A" id="classId-C_0000917656824503504804-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L15">
+        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L15">
           <g title="B" id="classId-C_0001235773045370563004-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L25">
+        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L25">
           <g title="G" id="classId-C_0001365815261671395853-7" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L3">
+        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L3">
           <g title="a" id="classId-C_0001158868779503074564-8" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L11">
+        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L11">
           <g title="f" id="classId-C_0002123626454198320938-9" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -242,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L20">
+        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L20">
           <g title="D" id="classId-C_0001266390196945323478-10" class="node default clickable">
             <rect height="57" width="149.25" y="-28.5" x="-74.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.625" x1="-74.625" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L21">
+        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L21">
           <g title="E" id="classId-C_0000134928214982255105-11" class="node default clickable">
             <rect height="57" width="148.359375" y="-28.5" x="-74.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.1796875" x1="-74.1796875" class="divider"/>
@@ -280,15 +280,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1392.9921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L28">
+        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L28">
           <g title="h" id="classId-C_0001592677999268391183-12" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -35.5625, -21)" height="18" width="71.125" class="classTitle">
@@ -296,7 +296,7 @@
                   <span class="nodeLabel">detail4::h</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="26.703125">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="26.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">hhh</span>
                 </div>
@@ -304,15 +304,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1566.5078125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L29">
+        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L29">
           <g title="i" id="classId-C_0000441521323390223397-13" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -32.8984375, -21)" height="18" width="65.796875" class="classTitle">
@@ -320,7 +320,7 @@
                   <span class="nodeLabel">detail4::i</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="10.671875">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="10.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">iii</span>
                 </div>
@@ -328,15 +328,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.0234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L30">
+        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L30">
           <g title="j" id="classId-C_0000499334434426587347-14" class="node default clickable">
-            <rect height="101" width="123.515625" y="-50.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="1.5" y1="1.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -43)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -43)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -32.8984375, -21)" height="18" width="65.796875" class="classTitle">
@@ -344,7 +344,7 @@
                   <span class="nodeLabel">detail4::j</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="10.671875">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="10.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">jjj</span>
                 </div>
@@ -352,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1889.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L7">
+        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L7">
           <g title="c" id="classId-C_0001168031834662719964-15" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -371,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2016.296875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00054/t00054.cc#L9">
+        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00054/t00054.cc#L9">
           <g title="e" id="classId-C_0002037550833462858827-16" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md
index 81e27570..2b9f60a5 100644
--- a/docs/test_cases/t00055.md
+++ b/docs/test_cases/t00055.md
@@ -268,7 +268,7 @@ struct J { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index 700fb3cc..26e90231 100644
--- a/docs/test_cases/t00055_class.svg
+++ b/docs/test_cases/t00055_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="499px" preserveAspectRatio="none" style="width:429px;height:499px;" version="1.1" viewBox="0 0 429 499" width="429px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffzcy387v41y6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1m6vbyvlirikq" 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"/>
@@ -9,80 +9,80 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
       <ellipse cx="393" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.9688,29.6406 Q395.3906,29.9375 394.75,30.0781 Q394.1094,30.2344 393.4063,30.2344 Q390.9063,30.2344 389.5781,28.5938 Q388.2656,26.9375 388.2656,23.8125 Q388.2656,20.6875 389.5781,19.0313 Q390.9063,17.375 393.4063,17.375 Q394.1094,17.375 394.75,17.5313 Q395.4063,17.6875 395.9688,17.9844 L395.9688,20.7031 Q395.3438,20.125 394.75,19.8594 Q394.1563,19.5781 393.5313,19.5781 Q392.1875,19.5781 391.5,20.6563 Q390.8125,21.7188 390.8125,23.8125 Q390.8125,25.9063 391.5,26.9844 Q392.1875,28.0469 393.5313,28.0469 Q394.1563,28.0469 394.75,27.7813 Q395.3438,27.5 395.9688,26.9219 L395.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="407" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
       <ellipse cx="96" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,29.6406 Q98.3906,29.9375 97.75,30.0781 Q97.1094,30.2344 96.4063,30.2344 Q93.9063,30.2344 92.5781,28.5938 Q91.2656,26.9375 91.2656,23.8125 Q91.2656,20.6875 92.5781,19.0313 Q93.9063,17.375 96.4063,17.375 Q97.1094,17.375 97.75,17.5313 Q98.4063,17.6875 98.9688,17.9844 L98.9688,20.7031 Q98.3438,20.125 97.75,19.8594 Q97.1563,19.5781 96.5313,19.5781 Q95.1875,19.5781 94.5,20.6563 Q93.8125,21.7188 93.8125,23.8125 Q93.8125,25.9063 94.5,26.9844 Q95.1875,28.0469 96.5313,28.0469 Q97.1563,28.0469 97.75,27.7813 Q98.3438,27.5 98.9688,26.9219 L98.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
       <ellipse cx="392.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,137.6406 Q394.8906,137.9375 394.25,138.0781 Q393.6094,138.2344 392.9063,138.2344 Q390.4063,138.2344 389.0781,136.5938 Q387.7656,134.9375 387.7656,131.8125 Q387.7656,128.6875 389.0781,127.0313 Q390.4063,125.375 392.9063,125.375 Q393.6094,125.375 394.25,125.5313 Q394.9063,125.6875 395.4688,125.9844 L395.4688,128.7031 Q394.8438,128.125 394.25,127.8594 Q393.6563,127.5781 393.0313,127.5781 Q391.6875,127.5781 391,128.6563 Q390.3125,129.7188 390.3125,131.8125 Q390.3125,133.9063 391,134.9844 Q391.6875,136.0469 393.0313,136.0469 Q393.6563,136.0469 394.25,135.7813 Q394.8438,135.5 395.4688,134.9219 L395.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="136.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
       <ellipse cx="171" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,29.6406 Q173.3906,29.9375 172.75,30.0781 Q172.1094,30.2344 171.4063,30.2344 Q168.9063,30.2344 167.5781,28.5938 Q166.2656,26.9375 166.2656,23.8125 Q166.2656,20.6875 167.5781,19.0313 Q168.9063,17.375 171.4063,17.375 Q172.1094,17.375 172.75,17.5313 Q173.4063,17.6875 173.9688,17.9844 L173.9688,20.7031 Q173.3438,20.125 172.75,19.8594 Q172.1563,19.5781 171.5313,19.5781 Q170.1875,19.5781 169.5,20.6563 Q168.8125,21.7188 168.8125,23.8125 Q168.8125,25.9063 169.5,26.9844 Q170.1875,28.0469 171.5313,28.0469 Q172.1563,28.0469 172.75,27.7813 Q173.3438,27.5 173.9688,26.9219 L173.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="28.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
       <ellipse cx="393.5" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M396.4688,245.6406 Q395.8906,245.9375 395.25,246.0781 Q394.6094,246.2344 393.9063,246.2344 Q391.4063,246.2344 390.0781,244.5938 Q388.7656,242.9375 388.7656,239.8125 Q388.7656,236.6875 390.0781,235.0313 Q391.4063,233.375 393.9063,233.375 Q394.6094,233.375 395.25,233.5313 Q395.9063,233.6875 396.4688,233.9844 L396.4688,236.7031 Q395.8438,236.125 395.25,235.8594 Q394.6563,235.5781 394.0313,235.5781 Q392.6875,235.5781 392,236.6563 Q391.3125,237.7188 391.3125,239.8125 Q391.3125,241.9063 392,242.9844 Q392.6875,244.0469 394.0313,244.0469 Q394.6563,244.0469 395.25,243.7813 Q395.8438,243.5 396.4688,242.9219 L396.4688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="407.5" y="244.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
       <ellipse cx="246.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,29.6406 Q248.8906,29.9375 248.25,30.0781 Q247.6094,30.2344 246.9063,30.2344 Q244.4063,30.2344 243.0781,28.5938 Q241.7656,26.9375 241.7656,23.8125 Q241.7656,20.6875 243.0781,19.0313 Q244.4063,17.375 246.9063,17.375 Q247.6094,17.375 248.25,17.5313 Q248.9063,17.6875 249.4688,17.9844 L249.4688,20.7031 Q248.8438,20.125 248.25,19.8594 Q247.6563,19.5781 247.0313,19.5781 Q245.6875,19.5781 245,20.6563 Q244.3125,21.7188 244.3125,23.8125 Q244.3125,25.9063 245,26.9844 Q245.6875,28.0469 247.0313,28.0469 Q247.6563,28.0469 248.25,27.7813 Q248.8438,27.5 249.4688,26.9219 L249.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="28.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
       <ellipse cx="392.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,353.6406 Q394.8906,353.9375 394.25,354.0781 Q393.6094,354.2344 392.9063,354.2344 Q390.4063,354.2344 389.0781,352.5938 Q387.7656,350.9375 387.7656,347.8125 Q387.7656,344.6875 389.0781,343.0313 Q390.4063,341.375 392.9063,341.375 Q393.6094,341.375 394.25,341.5313 Q394.9063,341.6875 395.4688,341.9844 L395.4688,344.7031 Q394.8438,344.125 394.25,343.8594 Q393.6563,343.5781 393.0313,343.5781 Q391.6875,343.5781 391,344.6563 Q390.3125,345.7188 390.3125,347.8125 Q390.3125,349.9063 391,350.9844 Q391.6875,352.0469 393.0313,352.0469 Q393.6563,352.0469 394.25,351.7813 Q394.8438,351.5 395.4688,350.9219 L395.4688,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="352.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
       <ellipse cx="322.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,29.6406 Q324.8906,29.9375 324.25,30.0781 Q323.6094,30.2344 322.9063,30.2344 Q320.4063,30.2344 319.0781,28.5938 Q317.7656,26.9375 317.7656,23.8125 Q317.7656,20.6875 319.0781,19.0313 Q320.4063,17.375 322.9063,17.375 Q323.6094,17.375 324.25,17.5313 Q324.9063,17.6875 325.4688,17.9844 L325.4688,20.7031 Q324.8438,20.125 324.25,19.8594 Q323.6563,19.5781 323.0313,19.5781 Q321.6875,19.5781 321,20.6563 Q320.3125,21.7188 320.3125,23.8125 Q320.3125,25.9063 321,26.9844 Q321.6875,28.0469 323.0313,28.0469 Q323.6563,28.0469 324.25,27.7813 Q324.8438,27.5 325.4688,26.9219 L325.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="336.5" y="28.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffzcy387v41y6)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m6vbyvlirikq)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
       <ellipse cx="395.5" cy="456" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M398.4688,461.6406 Q397.8906,461.9375 397.25,462.0781 Q396.6094,462.2344 395.9063,462.2344 Q393.4063,462.2344 392.0781,460.5938 Q390.7656,458.9375 390.7656,455.8125 Q390.7656,452.6875 392.0781,451.0313 Q393.4063,449.375 395.9063,449.375 Q396.6094,449.375 397.25,449.5313 Q397.9063,449.6875 398.4688,449.9844 L398.4688,452.7031 Q397.8438,452.125 397.25,451.8594 Q396.6563,451.5781 396.0313,451.5781 Q394.6875,451.5781 394,452.6563 Q393.3125,453.7188 393.3125,455.8125 Q393.3125,457.9063 394,458.9844 Q394.6875,460.0469 396.0313,460.0469 Q396.6563,460.0469 397.25,459.7813 Q397.8438,459.5 398.4688,458.9219 L398.4688,461.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="409.5" y="460.1543">J</text>
diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg
index 7ea49863..505c337e 100644
--- a/docs/test_cases/t00055_class_mermaid.svg
+++ b/docs/test_cases/t00055_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 720.078125 73" style="max-width: 720.078px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 720.078125 73" style="max-width: 720.078px; background-color: white;" width="720.078125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L3">
           <g title="A" id="classId-C_0001697191682863715554-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L4">
+        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L4">
           <g title="B" id="classId-C_0000188599859894721517-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L5">
+        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L5">
           <g title="C" id="classId-C_0000625177137967392996-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L6">
+        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L6">
           <g title="D" id="classId-C_0001046415640323289221-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L7">
+        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L7">
           <g title="E" id="classId-C_0000702117239243796422-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L8">
+        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L8">
           <g title="F" id="classId-C_0001511375015718046137-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L9">
+        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L9">
           <g title="G" id="classId-C_0000651600874645139639-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L10">
+        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L10">
           <g title="H" id="classId-C_0000374142601071476038-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L11">
+        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L11">
           <g title="I" id="classId-C_0000295372236079742697-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00055/t00055.cc#L12">
+        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00055/t00055.cc#L12">
           <g title="J" id="classId-C_0000769231292718551090-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md
index 7e34c271..a22dc9b6 100644
--- a/docs/test_cases/t00056.md
+++ b/docs/test_cases/t00056.md
@@ -608,7 +608,7 @@ struct F {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index c9a23da9..e44e2ce1 100644
--- a/docs/test_cases/t00056_class.svg
+++ b/docs/test_cases/t00056_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="613px" preserveAspectRatio="none" style="width:1507px;height:613px;" version="1.1" viewBox="0 0 1507 613" width="1507px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hpsnvlvk1tm6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fziayuf2t90g2" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
       <ellipse cx="21" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,208.6094 Q23.3906,208.9063 22.75,209.0469 Q22.1094,209.2031 21.4063,209.2031 Q18.9063,209.2031 17.5781,207.5625 Q16.2656,205.9063 16.2656,202.7813 Q16.2656,199.6563 17.5781,198 Q18.9063,196.3438 21.4063,196.3438 Q22.1094,196.3438 22.75,196.5 Q23.4063,196.6563 23.9688,196.9531 L23.9688,199.6719 Q23.3438,199.0938 22.75,198.8281 Q22.1563,198.5469 21.5313,198.5469 Q20.1875,198.5469 19.5,199.625 Q18.8125,200.6875 18.8125,202.7813 Q18.8125,204.875 19.5,205.9531 Q20.1875,207.0156 21.5313,207.0156 Q22.1563,207.0156 22.75,206.75 Q23.3438,206.4688 23.9688,205.8906 L23.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="66.5" y="200.1387">«concept»</text>
@@ -20,8 +20,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
       <ellipse cx="238.5" cy="189.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M241.4688,195.6094 Q240.8906,195.9063 240.25,196.0469 Q239.6094,196.2031 238.9063,196.2031 Q236.4063,196.2031 235.0781,194.5625 Q233.7656,192.9063 233.7656,189.7813 Q233.7656,186.6563 235.0781,185 Q236.4063,183.3438 238.9063,183.3438 Q239.6094,183.3438 240.25,183.5 Q240.9063,183.6563 241.4688,183.9531 L241.4688,186.6719 Q240.8438,186.0938 240.25,185.8281 Q239.6563,185.5469 239.0313,185.5469 Q237.6875,185.5469 237,186.625 Q236.3125,187.6875 236.3125,189.7813 Q236.3125,191.875 237,192.9531 Q237.6875,194.0156 239.0313,194.0156 Q239.6563,194.0156 240.25,193.75 Q240.8438,193.4688 241.4688,192.8906 L241.4688,195.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="305.5" y="187.1387">«concept»</text>
@@ -33,8 +33,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="224.5" x2="447.5" y1="229.7422" y2="229.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="229.5" y="243.9526">sizeof (l) &gt; sizeof (r)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
       <ellipse cx="858.5" cy="547.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M861.4688,553.6094 Q860.8906,553.9063 860.25,554.0469 Q859.6094,554.2031 858.9063,554.2031 Q856.4063,554.2031 855.0781,552.5625 Q853.7656,550.9063 853.7656,547.7813 Q853.7656,544.6563 855.0781,543 Q856.4063,541.3438 858.9063,541.3438 Q859.6094,541.3438 860.25,541.5 Q860.9063,541.6563 861.4688,541.9531 L861.4688,544.6719 Q860.8438,544.0938 860.25,543.8281 Q859.6563,543.5469 859.0313,543.5469 Q857.6875,543.5469 857,544.625 Q856.3125,545.6875 856.3125,547.7813 Q856.3125,549.875 857,550.9531 Q857.6875,552.0156 859.0313,552.0156 Q859.6563,552.0156 860.25,551.75 Q860.8438,551.4688 861.4688,550.8906 L861.4688,553.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="888" y="545.1387">«concept»</text>
@@ -44,8 +44,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="566.9375" y2="566.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="574.9375" y2="574.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
       <ellipse cx="1163.8" cy="528.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1166.7688,534.6094 Q1166.1906,534.9063 1165.55,535.0469 Q1164.9094,535.2031 1164.2063,535.2031 Q1161.7063,535.2031 1160.3781,533.5625 Q1159.0656,531.9063 1159.0656,528.7813 Q1159.0656,525.6563 1160.3781,524 Q1161.7063,522.3438 1164.2063,522.3438 Q1164.9094,522.3438 1165.55,522.5 Q1166.2063,522.6563 1166.7688,522.9531 L1166.7688,525.6719 Q1166.1438,525.0938 1165.55,524.8281 Q1164.9563,524.5469 1164.3313,524.5469 Q1162.9875,524.5469 1162.3,525.625 Q1161.6125,526.6875 1161.6125,528.7813 Q1161.6125,530.875 1162.3,531.9531 Q1162.9875,533.0156 1164.3313,533.0156 Q1164.9563,533.0156 1165.55,532.75 Q1166.1438,532.4688 1166.7688,531.8906 L1166.7688,534.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1176.2" y="526.1387">«concept»</text>
@@ -58,8 +58,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="1153" y="582.9526">container.begin()</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="86" x="1153" y="595.7573">container.end()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
       <ellipse cx="1341.55" cy="534.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1344.5188,540.6094 Q1343.9406,540.9063 1343.3,541.0469 Q1342.6594,541.2031 1341.9563,541.2031 Q1339.4563,541.2031 1338.1281,539.5625 Q1336.8156,537.9063 1336.8156,534.7813 Q1336.8156,531.6563 1338.1281,530 Q1339.4563,528.3438 1341.9563,528.3438 Q1342.6594,528.3438 1343.3,528.5 Q1343.9563,528.6563 1344.5188,528.9531 L1344.5188,531.6719 Q1343.8938,531.0938 1343.3,530.8281 Q1342.7063,530.5469 1342.0813,530.5469 Q1340.7375,530.5469 1340.05,531.625 Q1339.3625,532.6875 1339.3625,534.7813 Q1339.3625,536.875 1340.05,537.9531 Q1340.7375,539.0156 1342.0813,539.0156 Q1342.7063,539.0156 1343.3,538.75 Q1343.8938,538.4688 1344.5188,537.8906 L1344.5188,540.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371.45" y="532.1387">«concept»</text>
@@ -71,8 +71,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1323.5" x2="1468.5" y1="574.7422" y2="574.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="1328.5" y="588.9526">typename T::value_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
       <ellipse cx="501.25" cy="346.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M504.2188,352.6094 Q503.6406,352.9063 503,353.0469 Q502.3594,353.2031 501.6563,353.2031 Q499.1563,353.2031 497.8281,351.5625 Q496.5156,349.9063 496.5156,346.7813 Q496.5156,343.6563 497.8281,342 Q499.1563,340.3438 501.6563,340.3438 Q502.3594,340.3438 503,340.5 Q503.6563,340.6563 504.2188,340.9531 L504.2188,343.6719 Q503.5938,343.0938 503,342.8281 Q502.4063,342.5469 501.7813,342.5469 Q500.4375,342.5469 499.75,343.625 Q499.0625,344.6875 499.0625,346.7813 Q499.0625,348.875 499.75,349.9531 Q500.4375,351.0156 501.7813,351.0156 Q502.4063,351.0156 503,350.75 Q503.5938,350.4688 504.2188,349.8906 L504.2188,352.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="554.25" y="344.1387">«concept»</text>
@@ -86,8 +86,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="435.5" y="413.7573">{std::to_string(s)} noexcept</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="281" x="435.5" y="426.562">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
       <ellipse cx="1314" cy="372.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1316.9688,378.1094 Q1316.3906,378.4063 1315.75,378.5469 Q1315.1094,378.7031 1314.4063,378.7031 Q1311.9063,378.7031 1310.5781,377.0625 Q1309.2656,375.4063 1309.2656,372.2813 Q1309.2656,369.1563 1310.5781,367.5 Q1311.9063,365.8438 1314.4063,365.8438 Q1315.1094,365.8438 1315.75,366 Q1316.4063,366.1563 1316.9688,366.4531 L1316.9688,369.1719 Q1316.3438,368.5938 1315.75,368.3281 Q1315.1563,368.0469 1314.5313,368.0469 Q1313.1875,368.0469 1312.5,369.125 Q1311.8125,370.1875 1311.8125,372.2813 Q1311.8125,374.375 1312.5,375.4531 Q1313.1875,376.5156 1314.5313,376.5156 Q1315.1563,376.5156 1315.75,376.25 Q1316.3438,375.9688 1316.9688,375.3906 L1316.9688,378.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371" y="369.6387">«concept»</text>
@@ -97,8 +97,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="391.4375" y2="391.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="399.4375" y2="399.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
       <ellipse cx="873" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M875.9688,208.6094 Q875.3906,208.9063 874.75,209.0469 Q874.1094,209.2031 873.4063,209.2031 Q870.9063,209.2031 869.5781,207.5625 Q868.2656,205.9063 868.2656,202.7813 Q868.2656,199.6563 869.5781,198 Q870.9063,196.3438 873.4063,196.3438 Q874.1094,196.3438 874.75,196.5 Q875.4063,196.6563 875.9688,196.9531 L875.9688,199.6719 Q875.3438,199.0938 874.75,198.8281 Q874.1563,198.5469 873.5313,198.5469 Q872.1875,198.5469 871.5,199.625 Q870.8125,200.6875 870.8125,202.7813 Q870.8125,204.875 871.5,205.9531 Q872.1875,207.0156 873.5313,207.0156 Q874.1563,207.0156 874.75,206.75 Q875.3438,206.4688 875.9688,205.8906 L875.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="943" y="200.1387">«concept»</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
       <ellipse cx="852" cy="366" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M854.9688,371.6406 Q854.3906,371.9375 853.75,372.0781 Q853.1094,372.2344 852.4063,372.2344 Q849.9063,372.2344 848.5781,370.5938 Q847.2656,368.9375 847.2656,365.8125 Q847.2656,362.6875 848.5781,361.0313 Q849.9063,359.375 852.4063,359.375 Q853.1094,359.375 853.75,359.5313 Q854.4063,359.6875 854.9688,359.9844 L854.9688,362.7031 Q854.3438,362.125 853.75,361.8594 Q853.1563,361.5781 852.5313,361.5781 Q851.1875,361.5781 850.5,362.6563 Q849.8125,363.7188 849.8125,365.8125 Q849.8125,367.9063 850.5,368.9844 Q851.1875,370.0469 852.5313,370.0469 Q853.1563,370.0469 853.75,369.7813 Q854.3438,369.5 854.9688,368.9219 L854.9688,371.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="866" y="370.1543">A</text>
@@ -118,15 +118,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="390" y2="390"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="843" y="396"/>
       <ellipse cx="848" cy="401" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="857" y="404.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
       <ellipse cx="957.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M960.4188,42.1406 Q959.8406,42.4375 959.2,42.5781 Q958.5594,42.7344 957.8563,42.7344 Q955.3563,42.7344 954.0281,41.0938 Q952.7156,39.4375 952.7156,36.3125 Q952.7156,33.1875 954.0281,31.5313 Q955.3563,29.875 957.8563,29.875 Q958.5594,29.875 959.2,30.0313 Q959.8563,30.1875 960.4188,30.4844 L960.4188,33.2031 Q959.7938,32.625 959.2,32.3594 Q958.6063,32.0781 957.9813,32.0781 Q956.6375,32.0781 955.95,33.1563 Q955.2625,34.2188 955.2625,36.3125 Q955.2625,38.4063 955.95,39.4844 Q956.6375,40.5469 957.9813,40.5469 Q958.6063,40.5469 959.2,40.2813 Q959.7938,40 960.4188,39.4219 L960.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="971.55" y="40.6543">B</text>
@@ -135,15 +135,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="948" y="66.5"/>
       <ellipse cx="953" cy="71.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="962" y="74.7104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
       <ellipse cx="499" cy="196.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,202.1406 Q501.3906,202.4375 500.75,202.5781 Q500.1094,202.7344 499.4063,202.7344 Q496.9063,202.7344 495.5781,201.0938 Q494.2656,199.4375 494.2656,196.3125 Q494.2656,193.1875 495.5781,191.5313 Q496.9063,189.875 499.4063,189.875 Q500.1094,189.875 500.75,190.0313 Q501.4063,190.1875 501.9688,190.4844 L501.9688,193.2031 Q501.3438,192.625 500.75,192.3594 Q500.1563,192.0781 499.5313,192.0781 Q498.1875,192.0781 497.5,193.1563 Q496.8125,194.2188 496.8125,196.3125 Q496.8125,198.4063 497.5,199.4844 Q498.1875,200.5469 499.5313,200.5469 Q500.1563,200.5469 500.75,200.2813 Q501.3438,200 501.9688,199.4219 L501.9688,202.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="513" y="200.6543">C</text>
@@ -152,15 +152,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="220.5" y2="220.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="490" y="226.5"/>
       <ellipse cx="495" cy="231.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="504" y="234.7104">c : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
       <ellipse cx="1039" cy="372.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,378.1406 Q1041.3906,378.4375 1040.75,378.5781 Q1040.1094,378.7344 1039.4063,378.7344 Q1036.9063,378.7344 1035.5781,377.0938 Q1034.2656,375.4375 1034.2656,372.3125 Q1034.2656,369.1875 1035.5781,367.5313 Q1036.9063,365.875 1039.4063,365.875 Q1040.1094,365.875 1040.75,366.0313 Q1041.4063,366.1875 1041.9688,366.4844 L1041.9688,369.2031 Q1041.3438,368.625 1040.75,368.3594 Q1040.1563,368.0781 1039.5313,368.0781 Q1038.1875,368.0781 1037.5,369.1563 Q1036.8125,370.2188 1036.8125,372.3125 Q1036.8125,374.4063 1037.5,375.4844 Q1038.1875,376.5469 1039.5313,376.5469 Q1040.1563,376.5469 1040.75,376.2813 Q1041.3438,376 1041.9688,375.4219 L1041.9688,378.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1053" y="376.6543">D</text>
@@ -169,8 +169,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="388.5" y2="388.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="396.5" y2="396.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
       <ellipse cx="302.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M305.4688,29.6406 Q304.8906,29.9375 304.25,30.0781 Q303.6094,30.2344 302.9063,30.2344 Q300.4063,30.2344 299.0781,28.5938 Q297.7656,26.9375 297.7656,23.8125 Q297.7656,20.6875 299.0781,19.0313 Q300.4063,17.375 302.9063,17.375 Q303.6094,17.375 304.25,17.5313 Q304.9063,17.6875 305.4688,17.9844 L305.4688,20.7031 Q304.8438,20.125 304.25,19.8594 Q303.6563,19.5781 303.0313,19.5781 Q301.6875,19.5781 301,20.6563 Q300.3125,21.7188 300.3125,23.8125 Q300.3125,25.9063 301,26.9844 Q301.6875,28.0469 303.0313,28.0469 Q303.6563,28.0469 304.25,27.7813 Q304.8438,27.5 305.4688,26.9219 L305.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="316.5" y="28.1543">E</text>
@@ -179,29 +179,29 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="54"/>
       <ellipse cx="298.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="62.2104">e1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="66.8047"/>
       <ellipse cx="298.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="75.0151">e2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="79.6094"/>
       <ellipse cx="298.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="87.8198">e3 : T3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hpsnvlvk1tm6)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fziayuf2t90g2)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
       <ellipse cx="64" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M66.9688,29.6406 Q66.3906,29.9375 65.75,30.0781 Q65.1094,30.2344 64.4063,30.2344 Q61.9063,30.2344 60.5781,28.5938 Q59.2656,26.9375 59.2656,23.8125 Q59.2656,20.6875 60.5781,19.0313 Q61.9063,17.375 64.4063,17.375 Q65.1094,17.375 65.75,17.5313 Q66.4063,17.6875 66.9688,17.9844 L66.9688,20.7031 Q66.3438,20.125 65.75,19.8594 Q65.1563,19.5781 64.5313,19.5781 Q63.1875,19.5781 62.5,20.6563 Q61.8125,21.7188 61.8125,23.8125 Q61.8125,25.9063 62.5,26.9844 Q63.1875,28.0469 64.5313,28.0469 Q65.1563,28.0469 65.75,27.7813 Q66.3438,27.5 66.9688,26.9219 L66.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="78" y="28.1543">F</text>
@@ -210,25 +210,25 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="54"/>
       <ellipse cx="60" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="62.2104">f1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="66.8047"/>
       <ellipse cx="60" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="75.0151">f2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="79.6094"/>
       <ellipse cx="60" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="87.8198">f3 : T3</text>
     </a>
     <path d="M669.56,433.19 C697.84,448.52 729.06,465.18 758,480 C789.06,495.91 824.03,512.91 852.89,526.69 " fill="none" id="C_0000137304962071054497-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg
index e442788c..266f71ce 100644
--- a/docs/test_cases/t00056_class_mermaid.svg
+++ b/docs/test_cases/t00056_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1519.96484375 778" style="max-width: 1519.96px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1519.96484375 778" style="max-width: 1519.96px; background-color: white;" width="1519.96484375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -222,7 +222,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L8">
+        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L8">
           <g title="greater_than_simple" id="classId-C_0000902541696362244204-0" class="node default clickable">
             <rect height="79" width="212.421875" y="-39.5" x="-106.2109375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="106.2109375" x1="-106.2109375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L11">
+        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L11">
           <g title="greater_than_with_requires" id="classId-C_0001830716585637735576-1" class="node default clickable">
             <rect height="123" width="266.65625" y="-61.5" x="-133.328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="133.328125" x1="-133.328125" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L16">
+        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L16">
           <g title="max_four_bytes" id="classId-C_0000385255522691733325-2" class="node default clickable">
             <rect height="79" width="166.1875" y="-39.5" x="-83.09375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="83.09375" x1="-83.09375" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L20">
+        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L20">
           <g title="iterable" id="classId-C_0000392540961352249242-3" class="node default clickable">
             <rect height="145" width="145.546875" y="-72.5" x="-72.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L27">
+        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L27">
           <g title="has_value_type" id="classId-C_0001850394311226276678-4" class="node default clickable">
             <rect height="123" width="195.0625" y="-61.5" x="-97.53125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.53125" x1="-97.53125" class="divider"/>
@@ -352,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L30">
+        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L30">
           <g title="convertible_to_string" id="classId-C_0000137304962071054497-5" class="node default clickable">
             <rect height="167" width="354.078125" y="-83.5" x="-177.0390625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
@@ -391,7 +391,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L46">
+        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L46">
           <g title="iterable_with_value_type" id="classId-C_0001043398062146751019-6" class="node default clickable">
             <rect height="79" width="232.875" y="-39.5" x="-116.4375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="116.4375" x1="-116.4375" class="divider"/>
@@ -410,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L49">
+        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L49">
           <g title="iterable_or_small_value_type" id="classId-C_0000866345615551223718-7" class="node default clickable">
             <rect height="79" width="266.703125" y="-39.5" x="-133.3515625" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="133.3515625" x1="-133.3515625" class="divider"/>
@@ -429,7 +429,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L53">
+        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L53">
           <g title="A" id="classId-C_0001418333499545421661-8" class="node default clickable">
             <rect height="79" width="182.1875" y="-39.5" x="-91.09375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="91.09375" x1="-91.09375" class="divider"/>
@@ -453,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L60">
+        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L60">
           <g title="B" id="classId-C_0001814355496814977880-9" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -477,7 +477,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L70">
+        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L70">
           <g title="C" id="classId-C_0001512618198241549089-10" class="node default clickable">
             <rect height="79" width="222.171875" y="-39.5" x="-111.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="111.0859375" x1="-111.0859375" class="divider"/>
@@ -501,7 +501,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L76">
+        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L76">
           <g title="D" id="classId-C_0001635109601630198093-11" class="node default clickable">
             <rect height="57" width="279.109375" y="-28.5" x="-139.5546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="139.5546875" x1="-139.5546875" class="divider"/>
@@ -520,7 +520,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L80">
+        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L80">
           <g title="E" id="classId-C_0001429225801945621089-12" class="node default clickable">
             <rect height="123" width="109.265625" y="-61.5" x="-54.6328125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.6328125" x1="-54.6328125" class="divider"/>
@@ -554,7 +554,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00056/t00056.cc#L88">
+        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00056/t00056.cc#L88">
           <g title="F" id="classId-C_0000856301122972546034-13" class="node default clickable">
             <rect height="123" width="108.375" y="-61.5" x="-54.1875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.1875" x1="-54.1875" class="divider"/>
diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md
index 1d3a56ac..e78d1cd4 100644
--- a/docs/test_cases/t00057.md
+++ b/docs/test_cases/t00057.md
@@ -552,7 +552,7 @@ struct t00057_R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 73e936bd..efe5d381 100644
--- a/docs/test_cases/t00057_class.svg
+++ b/docs/test_cases/t00057_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="476px" preserveAspectRatio="none" style="width:1040px;height:476px;" version="1.1" viewBox="0 0 1040 476" width="1040px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hesyakbflipp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fj9cf1rk4u8v3" 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"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
       <ellipse cx="21" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,257.1406 Q23.3906,257.4375 22.75,257.5781 Q22.1094,257.7344 21.4063,257.7344 Q18.9063,257.7344 17.5781,256.0938 Q16.2656,254.4375 16.2656,251.3125 Q16.2656,248.1875 17.5781,246.5313 Q18.9063,244.875 21.4063,244.875 Q22.1094,244.875 22.75,245.0313 Q23.4063,245.1875 23.9688,245.4844 L23.9688,248.2031 Q23.3438,247.625 22.75,247.3594 Q22.1563,247.0781 21.5313,247.0781 Q20.1875,247.0781 19.5,248.1563 Q18.8125,249.2188 18.8125,251.3125 Q18.8125,253.4063 19.5,254.4844 Q20.1875,255.5469 21.5313,255.5469 Q22.1563,255.5469 22.75,255.2813 Q23.3438,255 23.9688,254.4219 L23.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="255.6543">t00057_A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="281.5"/>
       <ellipse cx="17" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="26" y="289.7104">a1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
       <ellipse cx="147" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.9688,257.1406 Q149.3906,257.4375 148.75,257.5781 Q148.1094,257.7344 147.4063,257.7344 Q144.9063,257.7344 143.5781,256.0938 Q142.2656,254.4375 142.2656,251.3125 Q142.2656,248.1875 143.5781,246.5313 Q144.9063,244.875 147.4063,244.875 Q148.1094,244.875 148.75,245.0313 Q149.4063,245.1875 149.9688,245.4844 L149.9688,248.2031 Q149.3438,247.625 148.75,247.3594 Q148.1563,247.0781 147.5313,247.0781 Q146.1875,247.0781 145.5,248.1563 Q144.8125,249.2188 144.8125,251.3125 Q144.8125,253.4063 145.5,254.4844 Q146.1875,255.5469 147.5313,255.5469 Q148.1563,255.5469 148.75,255.2813 Q149.3438,255 149.9688,254.4219 L149.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="255.6543">t00057_B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="281.5"/>
       <ellipse cx="143" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="152" y="289.7104">b1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
       <ellipse cx="273" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M275.9688,257.1406 Q275.3906,257.4375 274.75,257.5781 Q274.1094,257.7344 273.4063,257.7344 Q270.9063,257.7344 269.5781,256.0938 Q268.2656,254.4375 268.2656,251.3125 Q268.2656,248.1875 269.5781,246.5313 Q270.9063,244.875 273.4063,244.875 Q274.1094,244.875 274.75,245.0313 Q275.4063,245.1875 275.9688,245.4844 L275.9688,248.2031 Q275.3438,247.625 274.75,247.3594 Q274.1563,247.0781 273.5313,247.0781 Q272.1875,247.0781 271.5,248.1563 Q270.8125,249.2188 270.8125,251.3125 Q270.8125,253.4063 271.5,254.4844 Q272.1875,255.5469 273.5313,255.5469 Q274.1563,255.5469 274.75,255.2813 Q275.3438,255 275.9688,254.4219 L275.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="255.6543">t00057_C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="264" y="281.5"/>
       <ellipse cx="269" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="278" y="289.7104">c1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
       <ellipse cx="399.5" cy="244.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M402.4688,250.6094 Q401.8906,250.9063 401.25,251.0469 Q400.6094,251.2031 399.9063,251.2031 Q397.4063,251.2031 396.0781,249.5625 Q394.7656,247.9063 394.7656,244.7813 Q394.7656,241.6563 396.0781,240 Q397.4063,238.3438 399.9063,238.3438 Q400.6094,238.3438 401.25,238.5 Q401.9063,238.6563 402.4688,238.9531 L402.4688,241.6719 Q401.8438,241.0938 401.25,240.8281 Q400.6563,240.5469 400.0313,240.5469 Q398.6875,240.5469 398,241.625 Q397.3125,242.6875 397.3125,244.7813 Q397.3125,246.875 398,247.9531 Q398.6875,249.0156 400.0313,249.0156 Q400.6563,249.0156 401.25,248.75 Q401.8438,248.4688 402.4688,247.8906 L402.4688,250.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="242.1387">«union»</text>
@@ -63,73 +63,73 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="263.9375" y2="263.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="271.9375" y2="271.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="277.9375"/>
       <ellipse cx="395.5" cy="282.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="404.5" y="286.1479">d1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="290.7422"/>
       <ellipse cx="395.5" cy="295.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="404.5" y="298.9526">d2 : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
       <ellipse cx="610.75" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.7188,244.6406 Q613.1406,244.9375 612.5,245.0781 Q611.8594,245.2344 611.1563,245.2344 Q608.6563,245.2344 607.3281,243.5938 Q606.0156,241.9375 606.0156,238.8125 Q606.0156,235.6875 607.3281,234.0313 Q608.6563,232.375 611.1563,232.375 Q611.8594,232.375 612.5,232.5313 Q613.1563,232.6875 613.7188,232.9844 L613.7188,235.7031 Q613.0938,235.125 612.5,234.8594 Q611.9063,234.5781 611.2813,234.5781 Q609.9375,234.5781 609.25,235.6563 Q608.5625,236.7188 608.5625,238.8125 Q608.5625,240.9063 609.25,241.9844 Q609.9375,243.0469 611.2813,243.0469 Q611.9063,243.0469 612.5,242.7813 Q613.0938,242.5 613.7188,241.9219 L613.7188,244.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="243.1543">t00057_E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="255" y2="255"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="263" y2="263"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="269"/>
       <ellipse cx="522.5" cy="274" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="240" x="531.5" y="277.2104">coordinates : t00057_E::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="281.8047"/>
       <ellipse cx="522.5" cy="286.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="531.5" y="290.0151">e : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="294.6094"/>
       <ellipse cx="522.5" cy="299.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="531.5" y="302.8198">height : t00057_E::(anonymous_807)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
       <ellipse cx="466.5" cy="405" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.4688,410.6406 Q468.8906,410.9375 468.25,411.0781 Q467.6094,411.2344 466.9063,411.2344 Q464.4063,411.2344 463.0781,409.5938 Q461.7656,407.9375 461.7656,404.8125 Q461.7656,401.6875 463.0781,400.0313 Q464.4063,398.375 466.9063,398.375 Q467.6094,398.375 468.25,398.5313 Q468.9063,398.6875 469.4688,398.9844 L469.4688,401.7031 Q468.8438,401.125 468.25,400.8594 Q467.6563,400.5781 467.0313,400.5781 Q465.6875,400.5781 465,401.6563 Q464.3125,402.7188 464.3125,404.8125 Q464.3125,406.9063 465,407.9844 Q465.6875,409.0469 467.0313,409.0469 Q467.6563,409.0469 468.25,408.7813 Q468.8438,408.5 469.4688,407.9219 L469.4688,410.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="409.1543">t00057_E::(coordinates)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="421" y2="421"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="429" y2="429"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="435"/>
       <ellipse cx="462.5" cy="440" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="443.2104">x : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="447.8047"/>
       <ellipse cx="462.5" cy="452.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="456.0151">y : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
       <ellipse cx="686" cy="404.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M688.9688,410.6094 Q688.3906,410.9063 687.75,411.0469 Q687.1094,411.2031 686.4063,411.2031 Q683.9063,411.2031 682.5781,409.5625 Q681.2656,407.9063 681.2656,404.7813 Q681.2656,401.6563 682.5781,400 Q683.9063,398.3438 686.4063,398.3438 Q687.1094,398.3438 687.75,398.5 Q688.4063,398.6563 688.9688,398.9531 L688.9688,401.6719 Q688.3438,401.0938 687.75,400.8281 Q687.1563,400.5469 686.5313,400.5469 Q685.1875,400.5469 684.5,401.625 Q683.8125,402.6875 683.8125,404.7813 Q683.8125,406.875 684.5,407.9531 Q685.1875,409.0156 686.5313,409.0156 Q687.1563,409.0156 687.75,408.75 Q688.3438,408.4688 688.9688,407.8906 L688.9688,410.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="402.1387">«union»</text>
@@ -137,105 +137,105 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="423.9375" y2="423.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="431.9375" y2="431.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="437.9375"/>
       <ellipse cx="682" cy="442.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="691" y="446.1479">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="450.7422"/>
       <ellipse cx="682" cy="455.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="691" y="458.9526">z : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
       <ellipse cx="827.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M830.4688,257.1406 Q829.8906,257.4375 829.25,257.5781 Q828.6094,257.7344 827.9063,257.7344 Q825.4063,257.7344 824.0781,256.0938 Q822.7656,254.4375 822.7656,251.3125 Q822.7656,248.1875 824.0781,246.5313 Q825.4063,244.875 827.9063,244.875 Q828.6094,244.875 829.25,245.0313 Q829.9063,245.1875 830.4688,245.4844 L830.4688,248.2031 Q829.8438,247.625 829.25,247.3594 Q828.6563,247.0781 828.0313,247.0781 Q826.6875,247.0781 826,248.1563 Q825.3125,249.2188 825.3125,251.3125 Q825.3125,253.4063 826,254.4844 Q826.6875,255.5469 828.0313,255.5469 Q828.6563,255.5469 829.25,255.2813 Q829.8438,255 830.4688,254.4219 L830.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="841.5" y="255.6543">t00057_G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="281.5"/>
       <ellipse cx="823.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="832.5" y="289.7104">g1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
       <ellipse cx="397.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M400.2188,29.6406 Q399.6406,29.9375 399,30.0781 Q398.3594,30.2344 397.6563,30.2344 Q395.1563,30.2344 393.8281,28.5938 Q392.5156,26.9375 392.5156,23.8125 Q392.5156,20.6875 393.8281,19.0313 Q395.1563,17.375 397.6563,17.375 Q398.3594,17.375 399,17.5313 Q399.6563,17.6875 400.2188,17.9844 L400.2188,20.7031 Q399.5938,20.125 399,19.8594 Q398.4063,19.5781 397.7813,19.5781 Q396.4375,19.5781 395.75,20.6563 Q395.0625,21.7188 395.0625,23.8125 Q395.0625,25.9063 395.75,26.9844 Q396.4375,28.0469 397.7813,28.0469 Q398.4063,28.0469 399,27.7813 Q399.5938,27.5 400.2188,26.9219 L400.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="416.75" y="28.1543">t00057_R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="54"/>
       <ellipse cx="368.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="377.5" y="62.2104">a : struct t00057_A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="66.8047"/>
       <ellipse cx="368.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="377.5" y="75.0151">b : t00057_B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="79.6094"/>
       <ellipse cx="368.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="87.8198">c : struct t00057_C *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="92.4141"/>
       <ellipse cx="368.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="377.5" y="100.6245">d : union t00057_D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="105.2188"/>
       <ellipse cx="368.5" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="113.4292">e : struct t00057_E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="118.0234"/>
       <ellipse cx="368.5" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="377.5" y="126.2339">f : struct t00057_F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="130.8281"/>
       <ellipse cx="368.5" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="377.5" y="139.0386">g : struct t00057_G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hesyakbflipp)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj9cf1rk4u8v3)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
       <ellipse cx="954.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M957.4688,257.1406 Q956.8906,257.4375 956.25,257.5781 Q955.6094,257.7344 954.9063,257.7344 Q952.4063,257.7344 951.0781,256.0938 Q949.7656,254.4375 949.7656,251.3125 Q949.7656,248.1875 951.0781,246.5313 Q952.4063,244.875 954.9063,244.875 Q955.6094,244.875 956.25,245.0313 Q956.9063,245.1875 957.4688,245.4844 L957.4688,248.2031 Q956.8438,247.625 956.25,247.3594 Q955.6563,247.0781 955.0313,247.0781 Q953.6875,247.0781 953,248.1563 Q952.3125,249.2188 952.3125,251.3125 Q952.3125,253.4063 953,254.4844 Q953.6875,255.5469 955.0313,255.5469 Q955.6563,255.5469 956.25,255.2813 Q956.8438,255 957.4688,254.4219 L957.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="968.5" y="255.6543">t00057_F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="945.5" y="281.5"/>
       <ellipse cx="950.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="959.5" y="289.7104">f1 : int</text>
     </a>
     <path d="M610.32,320.47 C595.89,343.04 579.48,368.72 566.53,388.97 " fill="none" id="C_0000682873132844345324&lt;-C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg
index 64d0b5a8..6a87930f 100644
--- a/docs/test_cases/t00057_class_mermaid.svg
+++ b/docs/test_cases/t00057_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1154 609" style="max-width: 1154px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1154 609" style="max-width: 1154px; background-color: white;" width="1154" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -162,7 +162,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L3">
+        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L3">
           <g title="t00057_A" id="classId-C_0000940295970488928395-0" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L7">
+        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L7">
           <g title="t00057_B" id="classId-C_0001030391494410415852-1" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L11">
+        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L11">
           <g title="t00057_C" id="classId-C_0000388213894542327772-2" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L15">
+        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L15">
           <g title="t00057_D" id="classId-C_0000784667124248020371-3" class="node default clickable">
             <rect height="123" width="85.71875" y="-61.5" x="-42.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.859375" x1="-42.859375" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L20">
+        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L20">
           <g title="t00057_E" id="classId-C_0000682873132844345324-4" class="node default clickable">
             <rect height="123" width="326.765625" y="-61.5" x="-163.3828125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="163.3828125" x1="-163.3828125" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L22">
+        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L22">
           <g title="t00057_E##(coordinates)" id="classId-C_0000161676142413826748-5" class="node default clickable">
             <rect height="101" width="196.390625" y="-50.5" x="-98.1953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="98.1953125" x1="-98.1953125" class="divider"/>
@@ -326,7 +326,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L26">
+        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L26">
           <g title="t00057_E##(height)" id="classId-C_0002265335931722752750-6" class="node default clickable">
             <rect height="123" width="153.703125" y="-61.5" x="-76.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.8515625" x1="-76.8515625" class="divider"/>
@@ -355,7 +355,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L32">
+        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L32">
           <g title="t00057_G" id="classId-C_0001592909736406415155-7" class="node default clickable">
             <rect height="79" width="86.171875" y="-39.5" x="-43.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="43.0859375" x1="-43.0859375" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/t00057.c#L36">
+        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/t00057.c#L36">
           <g title="t00057_R" id="classId-C_0000370583978606928327-8" class="node default clickable">
             <rect height="211" width="160.421875" y="-105.5" x="-80.2109375" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="80.2109375" x1="-80.2109375" class="divider"/>
@@ -433,7 +433,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00057/include/t00057.h#L3">
+        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00057/include/t00057.h#L3">
           <g title="t00057_F" id="classId-C_0000085797106299568719-9" class="node default clickable">
             <rect height="79" width="83.5" y="-39.5" x="-41.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="41.75" x1="-41.75" class="divider"/>
diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md
index 70872c16..96908e3f 100644
--- a/docs/test_cases/t00058.md
+++ b/docs/test_cases/t00058.md
@@ -435,7 +435,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index bf2653c7..211b66b3 100644
--- a/docs/test_cases/t00058_class.svg
+++ b/docs/test_cases/t00058_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="809px" preserveAspectRatio="none" style="width:437px;height:809px;" version="1.1" viewBox="0 0 437 809" width="437px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bwhszx3w8zke" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1llfyazr9u7y2" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
       <ellipse cx="170.5" cy="766" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.4688,771.6406 Q172.8906,771.9375 172.25,772.0781 Q171.6094,772.2344 170.9063,772.2344 Q168.4063,772.2344 167.0781,770.5938 Q165.7656,768.9375 165.7656,765.8125 Q165.7656,762.6875 167.0781,761.0313 Q168.4063,759.375 170.9063,759.375 Q171.6094,759.375 172.25,759.5313 Q172.9063,759.6875 173.4688,759.9844 L173.4688,762.7031 Q172.8438,762.125 172.25,761.8594 Q171.6563,761.5781 171.0313,761.5781 Q169.6875,761.5781 169,762.6563 Q168.3125,763.7188 168.3125,765.8125 Q168.3125,767.9063 169,768.9844 Q169.6875,770.0469 171.0313,770.0469 Q171.6563,770.0469 172.25,769.7813 Q172.8438,769.5 173.4688,768.9219 L173.4688,771.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="184.5" y="770.1543">first_type</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="782" y2="782"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="790" y2="790"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
       <ellipse cx="140" cy="653.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M142.9688,659.6094 Q142.3906,659.9063 141.75,660.0469 Q141.1094,660.2031 140.4063,660.2031 Q137.9063,660.2031 136.5781,658.5625 Q135.2656,656.9063 135.2656,653.7813 Q135.2656,650.6563 136.5781,649 Q137.9063,647.3438 140.4063,647.3438 Q141.1094,647.3438 141.75,647.5 Q142.4063,647.6563 142.9688,647.9531 L142.9688,650.6719 Q142.3438,650.0938 141.75,649.8281 Q141.1563,649.5469 140.5313,649.5469 Q139.1875,649.5469 138.5,650.625 Q137.8125,651.6875 137.8125,653.7813 Q137.8125,655.875 138.5,656.9531 Q139.1875,658.0156 140.5313,658.0156 Q141.1563,658.0156 141.75,657.75 Q142.3438,657.4688 142.9688,656.8906 L142.9688,659.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="180.5" y="651.1387">«concept»</text>
@@ -30,8 +30,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="672.9375" y2="672.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="680.9375" y2="680.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
       <ellipse cx="125.15" cy="513" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M128.1188,518.6406 Q127.5406,518.9375 126.9,519.0781 Q126.2594,519.2344 125.5563,519.2344 Q123.0563,519.2344 121.7281,517.5938 Q120.4156,515.9375 120.4156,512.8125 Q120.4156,509.6875 121.7281,508.0313 Q123.0563,506.375 125.5563,506.375 Q126.2594,506.375 126.9,506.5313 Q127.5563,506.6875 128.1188,506.9844 L128.1188,509.7031 Q127.4938,509.125 126.9,508.8594 Q126.3063,508.5781 125.6813,508.5781 Q124.3375,508.5781 123.65,509.6563 Q122.9625,510.7188 122.9625,512.8125 Q122.9625,514.9063 123.65,515.9844 Q124.3375,517.0469 125.6813,517.0469 Q126.3063,517.0469 126.9,516.7813 Q127.4938,516.5 128.1188,515.9219 L128.1188,518.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="142.85" y="517.1543">A</text>
@@ -40,15 +40,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="537" y2="537"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="99.5" y="543"/>
       <ellipse cx="104.5" cy="548" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="113.5" y="551.2104">a : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
       <ellipse cx="256.2" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.1688,414.6406 Q258.5906,414.9375 257.95,415.0781 Q257.3094,415.2344 256.6063,415.2344 Q254.1063,415.2344 252.7781,413.5938 Q251.4656,411.9375 251.4656,408.8125 Q251.4656,405.6875 252.7781,404.0313 Q254.1063,402.375 256.6063,402.375 Q257.3094,402.375 257.95,402.5313 Q258.6063,402.6875 259.1688,402.9844 L259.1688,405.7031 Q258.5438,405.125 257.95,404.8594 Q257.3563,404.5781 256.7313,404.5781 Q255.3875,404.5781 254.7,405.6563 Q254.0125,406.7188 254.0125,408.8125 Q254.0125,410.9063 254.7,411.9844 Q255.3875,413.0469 256.7313,413.0469 Q257.3563,413.0469 257.95,412.7813 Q258.5438,412.5 259.1688,411.9219 L259.1688,414.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="272.8" y="413.1543">B</text>
@@ -57,22 +57,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="439"/>
       <ellipse cx="240.5" cy="444" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="249.5" y="447.2104">b : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="451.8047"/>
       <ellipse cx="240.5" cy="456.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="460.0151">bb : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
       <ellipse cx="27.5" cy="253" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M30.4688,258.6406 Q29.8906,258.9375 29.25,259.0781 Q28.6094,259.2344 27.9063,259.2344 Q25.4063,259.2344 24.0781,257.5938 Q22.7656,255.9375 22.7656,252.8125 Q22.7656,249.6875 24.0781,248.0313 Q25.4063,246.375 27.9063,246.375 Q28.6094,246.375 29.25,246.5313 Q29.9063,246.6875 30.4688,246.9844 L30.4688,249.7031 Q29.8438,249.125 29.25,248.8594 Q28.6563,248.5781 28.0313,248.5781 Q26.6875,248.5781 26,249.6563 Q25.3125,250.7188 25.3125,252.8125 Q25.3125,254.9063 26,255.9844 Q26.6875,257.0469 28.0313,257.0469 Q28.6563,257.0469 29.25,256.7813 Q29.8438,256.5 30.4688,255.9219 L30.4688,258.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="41.5" y="257.1543">A</text>
@@ -81,8 +81,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="269" y2="269"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="277" y2="277"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
       <ellipse cx="177" cy="331" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M179.9688,336.6406 Q179.3906,336.9375 178.75,337.0781 Q178.1094,337.2344 177.4063,337.2344 Q174.9063,337.2344 173.5781,335.5938 Q172.2656,333.9375 172.2656,330.8125 Q172.2656,327.6875 173.5781,326.0313 Q174.9063,324.375 177.4063,324.375 Q178.1094,324.375 178.75,324.5313 Q179.4063,324.6875 179.9688,324.9844 L179.9688,327.7031 Q179.3438,327.125 178.75,326.8594 Q178.1563,326.5781 177.5313,326.5781 Q176.1875,326.5781 175.5,327.6563 Q174.8125,328.7188 174.8125,330.8125 Q174.8125,332.9063 175.5,333.9844 Q176.1875,335.0469 177.5313,335.0469 Q178.1563,335.0469 178.75,334.7813 Q179.3438,334.5 179.9688,333.9219 L179.9688,336.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="335.1543">A</text>
@@ -91,8 +91,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="347" y2="347"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="355" y2="355"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
       <ellipse cx="177.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M180.4688,180.6406 Q179.8906,180.9375 179.25,181.0781 Q178.6094,181.2344 177.9063,181.2344 Q175.4063,181.2344 174.0781,179.5938 Q172.7656,177.9375 172.7656,174.8125 Q172.7656,171.6875 174.0781,170.0313 Q175.4063,168.375 177.9063,168.375 Q178.6094,168.375 179.25,168.5313 Q179.9063,168.6875 180.4688,168.9844 L180.4688,171.7031 Q179.8438,171.125 179.25,170.8594 Q178.6563,170.5781 178.0313,170.5781 Q176.6875,170.5781 176,171.6563 Q175.3125,172.7188 175.3125,174.8125 Q175.3125,176.9063 176,177.9844 Q176.6875,179.0469 178.0313,179.0469 Q178.6563,179.0469 179.25,178.7813 Q179.8438,178.5 180.4688,177.9219 L180.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191.5" y="179.1543">B</text>
@@ -101,26 +101,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bwhszx3w8zke)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1llfyazr9u7y2)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
       <ellipse cx="135.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.7188,29.6406 Q138.1406,29.9375 137.5,30.0781 Q136.8594,30.2344 136.1563,30.2344 Q133.6563,30.2344 132.3281,28.5938 Q131.0156,26.9375 131.0156,23.8125 Q131.0156,20.6875 132.3281,19.0313 Q133.6563,17.375 136.1563,17.375 Q136.8594,17.375 137.5,17.5313 Q138.1563,17.6875 138.7188,17.9844 L138.7188,20.7031 Q138.0938,20.125 137.5,19.8594 Q136.9063,19.5781 136.2813,19.5781 Q134.9375,19.5781 134.25,20.6563 Q133.5625,21.7188 133.5625,23.8125 Q133.5625,25.9063 134.25,26.9844 Q134.9375,28.0469 136.2813,28.0469 Q136.9063,28.0469 137.5,27.7813 Q138.0938,27.5 138.7188,26.9219 L138.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="26" y="62.2104">aa : A&lt;int,int,double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="250" x="26" y="75.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
     </a>
     <path d="M174.26,558.24 C185.3,579.75 200.17,608.73 211.31,630.43 " fill="none" id="C_0000798619347004821702-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg
index ac57cb03..346b04e6 100644
--- a/docs/test_cases/t00058_class_mermaid.svg
+++ b/docs/test_cases/t00058_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 652.8828125 647" style="max-width: 652.883px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 652.8828125 647" style="max-width: 652.883px; background-color: white;" width="652.8828125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -82,38 +82,46 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -142,7 +150,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L11">
+        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L11">
           <g title="first_type" id="classId-C_0000039461943261269692-0" class="node default clickable">
             <rect height="57" width="167.953125" y="-28.5" x="-83.9765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.9765625" x1="-83.9765625" class="divider"/>
@@ -161,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L22">
+        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L22">
           <g title="same_as_first_type" id="classId-C_0001725820236573641307-1" class="node default clickable">
             <rect height="79" width="244.46875" y="-39.5" x="-122.234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="122.234375" x1="-122.234375" class="divider"/>
@@ -180,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27">
+        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0000798619347004821702-2" class="node default clickable">
             <rect height="79" width="148.84375" y="-39.5" x="-74.421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -204,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33">
+        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000420594889696591405-3" class="node default clickable">
             <rect height="101" width="148.84375" y="-50.5" x="-74.421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -233,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L27">
+        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0001724002183455178980-4" class="node default clickable">
             <rect height="57" width="229.21875" y="-28.5" x="-114.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="114.609375" x1="-114.609375" class="divider"/>
@@ -252,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33">
+        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33">
           <g title="A" id="classId-C_0001372381231906520278-5" class="node default clickable">
             <rect height="57" width="88.78125" y="-28.5" x="-44.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="44.390625" x1="-44.390625" class="divider"/>
@@ -271,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L33">
+        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000290383080560130133-6" class="node default clickable">
             <rect height="57" width="307.4375" y="-28.5" x="-153.71875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="153.71875" x1="-153.71875" class="divider"/>
@@ -290,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00058/t00058.cc#L38">
+        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00058/t00058.cc#L38">
           <g title="R" id="classId-C_0001015108159699260009-7" class="node default clickable">
             <rect height="101" width="321.421875" y="-50.5" x="-160.7109375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="160.7109375" x1="-160.7109375" class="divider"/>
diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md
index ac9b31fb..cd88e72e 100644
--- a/docs/test_cases/t00059.md
+++ b/docs/test_cases/t00059.md
@@ -647,7 +647,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index 78db0541..e3c9f2d5 100644
--- a/docs/test_cases/t00059_class.svg
+++ b/docs/test_cases/t00059_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="679px" preserveAspectRatio="none" style="width:1199px;height:679px;" version="1.1" viewBox="0 0 1199 679" width="1199px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1840tujcdvmgo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rldl3cqx3umc" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
       <ellipse cx="549" cy="594.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.9688,600.6094 Q551.3906,600.9063 550.75,601.0469 Q550.1094,601.2031 549.4063,601.2031 Q546.9063,601.2031 545.5781,599.5625 Q544.2656,597.9063 544.2656,594.7813 Q544.2656,591.6563 545.5781,590 Q546.9063,588.3438 549.4063,588.3438 Q550.1094,588.3438 550.75,588.5 Q551.4063,588.6563 551.9688,588.9531 L551.9688,591.6719 Q551.3438,591.0938 550.75,590.8281 Q550.1563,590.5469 549.5313,590.5469 Q548.1875,590.5469 547.5,591.625 Q546.8125,592.6875 546.8125,594.7813 Q546.8125,596.875 547.5,597.9531 Q548.1875,599.0156 549.5313,599.0156 Q550.1563,599.0156 550.75,598.75 Q551.3438,598.4688 551.9688,597.8906 L551.9688,600.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="561" y="592.1387">«concept»</text>
@@ -23,8 +23,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="540" y="648.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="540" y="661.7573">t.get_name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
       <ellipse cx="475.5" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M478.4688,443.6094 Q477.8906,443.9063 477.25,444.0469 Q476.6094,444.2031 475.9063,444.2031 Q473.4063,444.2031 472.0781,442.5625 Q470.7656,440.9063 470.7656,437.7813 Q470.7656,434.6563 472.0781,433 Q473.4063,431.3438 475.9063,431.3438 Q476.6094,431.3438 477.25,431.5 Q477.9063,431.6563 478.4688,431.9531 L478.4688,434.6719 Q477.8438,434.0938 477.25,433.8281 Q476.6563,433.5469 476.0313,433.5469 Q474.6875,433.5469 474,434.625 Q473.3125,435.6875 473.3125,437.7813 Q473.3125,439.875 474,440.9531 Q474.6875,442.0156 476.0313,442.0156 Q476.6563,442.0156 477.25,441.75 Q477.8438,441.4688 478.4688,440.8906 L478.4688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="488.5" y="435.1387">«concept»</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="457" x2="569" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="462" y="491.9526">t.get_sweetness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
       <ellipse cx="622.7" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M625.6688,443.6094 Q625.0906,443.9063 624.45,444.0469 Q623.8094,444.2031 623.1063,444.2031 Q620.6063,444.2031 619.2781,442.5625 Q617.9656,440.9063 617.9656,437.7813 Q617.9656,434.6563 619.2781,433 Q620.6063,431.3438 623.1063,431.3438 Q623.8094,431.3438 624.45,431.5 Q625.1063,431.6563 625.6688,431.9531 L625.6688,434.6719 Q625.0438,434.0938 624.45,433.8281 Q623.8563,433.5469 623.2313,433.5469 Q621.8875,433.5469 621.2,434.625 Q620.5125,435.6875 620.5125,437.7813 Q620.5125,439.875 621.2,440.9531 Q621.8875,442.0156 623.2313,442.0156 Q623.8563,442.0156 624.45,441.75 Q625.0438,441.4688 625.6688,440.8906 L625.6688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="635.3" y="435.1387">«concept»</text>
@@ -49,96 +49,96 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="606" x2="714" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="611" y="491.9526">t.get_bitterness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
       <ellipse cx="65.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M68.7188,289.6406 Q68.1406,289.9375 67.5,290.0781 Q66.8594,290.2344 66.1563,290.2344 Q63.6563,290.2344 62.3281,288.5938 Q61.0156,286.9375 61.0156,283.8125 Q61.0156,280.6875 62.3281,279.0313 Q63.6563,277.375 66.1563,277.375 Q66.8594,277.375 67.5,277.5313 Q68.1563,277.6875 68.7188,277.9844 L68.7188,280.7031 Q68.0938,280.125 67.5,279.8594 Q66.9063,279.5781 66.2813,279.5781 Q64.9375,279.5781 64.25,280.6563 Q63.5625,281.7188 63.5625,283.8125 Q63.5625,285.9063 64.25,286.9844 Q64.9375,288.0469 66.2813,288.0469 Q66.9063,288.0469 67.5,287.7813 Q68.0938,287.5 68.7188,286.9219 L68.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="288.1543">gala_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="306"/>
       <ellipse cx="17" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="314.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="318.8047"/>
       <ellipse cx="17" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="327.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
       <ellipse cx="812.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.7188,289.6406 Q815.1406,289.9375 814.5,290.0781 Q813.8594,290.2344 813.1563,290.2344 Q810.6563,290.2344 809.3281,288.5938 Q808.0156,286.9375 808.0156,283.8125 Q808.0156,280.6875 809.3281,279.0313 Q810.6563,277.375 813.1563,277.375 Q813.8594,277.375 814.5,277.5313 Q815.1563,277.6875 815.7188,277.9844 L815.7188,280.7031 Q815.0938,280.125 814.5,279.8594 Q813.9063,279.5781 813.2813,279.5781 Q811.9375,279.5781 811.25,280.6563 Q810.5625,281.7188 810.5625,283.8125 Q810.5625,285.9063 811.25,286.9844 Q811.9375,288.0469 813.2813,288.0469 Q813.9063,288.0469 814.5,287.7813 Q815.0938,287.5 815.7188,286.9219 L815.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="833.25" y="288.1543">empire_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="306"/>
       <ellipse cx="772" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="781" y="314.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="318.8047"/>
       <ellipse cx="772" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="781" y="327.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
       <ellipse cx="1047.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1050.7188,289.6406 Q1050.1406,289.9375 1049.5,290.0781 Q1048.8594,290.2344 1048.1563,290.2344 Q1045.6563,290.2344 1044.3281,288.5938 Q1043.0156,286.9375 1043.0156,283.8125 Q1043.0156,280.6875 1044.3281,279.0313 Q1045.6563,277.375 1048.1563,277.375 Q1048.8594,277.375 1049.5,277.5313 Q1050.1563,277.6875 1050.7188,277.9844 L1050.7188,280.7031 Q1050.0938,280.125 1049.5,279.8594 Q1048.9063,279.5781 1048.2813,279.5781 Q1046.9375,279.5781 1046.25,280.6563 Q1045.5625,281.7188 1045.5625,283.8125 Q1045.5625,285.9063 1046.25,286.9844 Q1046.9375,288.0469 1048.2813,288.0469 Q1048.9063,288.0469 1049.5,287.7813 Q1050.0938,287.5 1050.7188,286.9219 L1050.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="1068.25" y="288.1543">lima_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="306"/>
       <ellipse cx="1003" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="1012" y="314.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="318.8047"/>
       <ellipse cx="1003" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="1012" y="327.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
       <ellipse cx="279.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M282.8688,289.6406 Q282.2906,289.9375 281.65,290.0781 Q281.0094,290.2344 280.3063,290.2344 Q277.8063,290.2344 276.4781,288.5938 Q275.1656,286.9375 275.1656,283.8125 Q275.1656,280.6875 276.4781,279.0313 Q277.8063,277.375 280.3063,277.375 Q281.0094,277.375 281.65,277.5313 Q282.3063,277.6875 282.8688,277.9844 L282.8688,280.7031 Q282.2438,280.125 281.65,279.8594 Q281.0563,279.5781 280.4313,279.5781 Q279.0875,279.5781 278.4,280.6563 Q277.7125,281.7188 277.7125,283.8125 Q277.7125,285.9063 278.4,286.9844 Q279.0875,288.0469 280.4313,288.0469 Q281.0563,288.0469 281.65,287.7813 Q282.2438,287.5 282.8688,286.9219 L282.8688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="288.1543">valencia_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="306"/>
       <ellipse cx="248" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="314.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="318.8047"/>
       <ellipse cx="248" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="257" y="327.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
       <ellipse cx="483" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M485.9688,289.6406 Q485.3906,289.9375 484.75,290.0781 Q484.1094,290.2344 483.4063,290.2344 Q480.9063,290.2344 479.5781,288.5938 Q478.2656,286.9375 478.2656,283.8125 Q478.2656,280.6875 479.5781,279.0313 Q480.9063,277.375 483.4063,277.375 Q484.1094,277.375 484.75,277.5313 Q485.4063,277.6875 485.9688,277.9844 L485.9688,280.7031 Q485.3438,280.125 484.75,279.8594 Q484.1563,279.5781 483.5313,279.5781 Q482.1875,279.5781 481.5,280.6563 Q480.8125,281.7188 480.8125,283.8125 Q480.8125,285.9063 481.5,286.9844 Q482.1875,288.0469 483.5313,288.0469 Q484.1563,288.0469 484.75,287.7813 Q485.3438,287.5 485.9688,286.9219 L485.9688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="288.1543">fruit_factory</text>
@@ -146,23 +146,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="580" y="277.1387">apple_c TA,orange_c TO</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="306"/>
       <ellipse cx="479" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="488" y="314.2104">create_apple() const : TA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="318.8047"/>
       <ellipse cx="479" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="327.0151">create_orange() const : TO</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
       <ellipse cx="272" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M274.9688,180.6406 Q274.3906,180.9375 273.75,181.0781 Q273.1094,181.2344 272.4063,181.2344 Q269.9063,181.2344 268.5781,179.5938 Q267.2656,177.9375 267.2656,174.8125 Q267.2656,171.6875 268.5781,170.0313 Q269.9063,168.375 272.4063,168.375 Q273.1094,168.375 273.75,168.5313 Q274.4063,168.6875 274.9688,168.9844 L274.9688,171.7031 Q274.3438,171.125 273.75,170.8594 Q273.1563,170.5781 272.5313,170.5781 Q271.1875,170.5781 270.5,171.6563 Q269.8125,172.7188 269.8125,174.8125 Q269.8125,176.9063 270.5,177.9844 Q271.1875,179.0469 272.5313,179.0469 Q273.1563,179.0469 273.75,178.7813 Q274.3438,178.5 274.9688,177.9219 L274.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="286" y="179.1543">fruit_factory</text>
@@ -171,8 +171,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
       <ellipse cx="688" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M690.9688,180.6406 Q690.3906,180.9375 689.75,181.0781 Q689.1094,181.2344 688.4063,181.2344 Q685.9063,181.2344 684.5781,179.5938 Q683.2656,177.9375 683.2656,174.8125 Q683.2656,171.6875 684.5781,170.0313 Q685.9063,168.375 688.4063,168.375 Q689.1094,168.375 689.75,168.5313 Q690.4063,168.6875 690.9688,168.9844 L690.9688,171.7031 Q690.3438,171.125 689.75,170.8594 Q689.1563,170.5781 688.5313,170.5781 Q687.1875,170.5781 686.5,171.6563 Q685.8125,172.7188 685.8125,174.8125 Q685.8125,176.9063 686.5,177.9844 Q687.1875,179.0469 688.5313,179.0469 Q689.1563,179.0469 689.75,178.7813 Q690.3438,178.5 690.9688,177.9219 L690.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="702" y="179.1543">fruit_factory</text>
@@ -181,26 +181,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1840tujcdvmgo)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rldl3cqx3umc)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
       <ellipse cx="546.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M549.7188,29.6406 Q549.1406,29.9375 548.5,30.0781 Q547.8594,30.2344 547.1563,30.2344 Q544.6563,30.2344 543.3281,28.5938 Q542.0156,26.9375 542.0156,23.8125 Q542.0156,20.6875 543.3281,19.0313 Q544.6563,17.375 547.1563,17.375 Q547.8594,17.375 548.5,17.5313 Q549.1563,17.6875 549.7188,17.9844 L549.7188,20.7031 Q549.0938,20.125 548.5,19.8594 Q547.9063,19.5781 547.2813,19.5781 Q545.9375,19.5781 545.25,20.6563 Q544.5625,21.7188 544.5625,23.8125 Q544.5625,25.9063 545.25,26.9844 Q545.9375,28.0469 547.2813,28.0469 Q547.9063,28.0469 548.5,27.7813 Q549.0938,27.5 549.7188,26.9219 L549.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="567.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="54"/>
       <ellipse cx="480.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="62.2104">factory_1 : fruit_factory_1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="66.8047"/>
       <ellipse cx="480.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="75.0151">factory_2 : fruit_factory_2</text>
     </a>
     <path d="M530.86,499.39 C540.67,521.03 552.94,548.09 563.42,571.19 " fill="none" id="C_0001932582371736186409-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg
index 598de6f5..1815e9cf 100644
--- a/docs/test_cases/t00059_class_mermaid.svg
+++ b/docs/test_cases/t00059_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1284.609375 797" style="max-width: 1284.61px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1490.921875 797" style="max-width: 1490.92px; background-color: white;" width="1490.921875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,21 +50,21 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M781.3984375,576L781.3984375,581.6666666666666C781.3984375,587.3333333333334,781.3984375,598.6666666666666,788.26953125,611.6682393630905C795.140625,624.6698120595145,808.8828125,639.3396241190289,815.75390625,646.6745301487862L822.625,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M980.9296875,576L980.9296875,581.6666666666666C980.9296875,587.3333333333334,980.9296875,598.6666666666666,974.05859375,611.6682393630905C967.1875,624.6698120595145,953.4453125,639.3396241190289,946.57421875,646.6745301487862L939.703125,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M821.5408191568048,385L814.850422214004,390.6666666666667C808.1600252712033,396.3333333333333,794.7792313856016,407.6666666666667,788.0888344428008,419C781.3984375,430.3333333333333,781.3984375,441.6666666666667,781.3984375,447.3333333333333L781.3984375,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M940.7873058431952,385L947.477702785996,390.6666666666667C954.1680997287967,396.3333333333333,967.5488936143984,407.6666666666667,974.2392905571992,419C980.9296875,430.3333333333333,980.9296875,441.6666666666667,980.9296875,447.3333333333333L980.9296875,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M214.04621787383178,234L195.44346281152647,238.16666666666666C176.8407077492212,242.33333333333334,139.63519762461058,250.66666666666666,121.03244256230529,259C102.4296875,267.3333333333333,102.4296875,275.6666666666667,102.4296875,279.8333333333333L102.4296875,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M341.2890625,234L341.2890625,238.16666666666666C341.2890625,242.33333333333334,341.2890625,250.66666666666666,341.2890625,259C341.2890625,267.3333333333333,341.2890625,275.6666666666667,341.2890625,279.8333333333333L341.2890625,284"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M511.0859375,232.39602609178385L539.078125,236.83002174315322C567.0703125,241.26401739452254,623.0546875,250.13200869726128,662.2016763245033,258.7326710152973C701.3486651490066,267.3333333333333,723.6582677980132,275.6666666666667,734.8130691225166,279.8333333333333L745.9678704470199,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M818.1139748831775,234L798.2681561526479,238.16666666666666C778.4223374221183,242.33333333333334,738.7306999610591,250.66666666666666,712.32358846011,259C685.9164769591612,267.3333333333333,672.7938914183222,275.6666666666667,666.2325986479028,279.8333333333333L659.6713058774834,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M967.8138872663551,234L969.8540206386292,238.16666666666666C971.8941540109034,242.33333333333334,975.9744207554517,250.66666666666666,995.9637728777258,261.53792710265924C1015.953125,272.40918753865185,1051.8515625,285.81837507730364,1069.80078125,292.52296884662957L1087.75,299.2275626159555"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M995.3108936915888,234L1001.3710572429908,238.16666666666666C1007.4312207943925,242.33333333333334,1019.5515478971962,250.66666666666666,1017.3055407808278,259C1015.0595336644592,267.3333333333333,998.4471923289184,275.6666666666667,990.141021661148,279.8333333333333L981.8348509933775,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M430.9765625,103.55383864671438L416.0286458333333,110.12819887226199C401.0807291666667,116.70255909780958,371.1848958333333,129.85127954890478,356.2369791666667,142.09230644111906C341.2890625,154.33333333333334,341.2890625,165.66666666666666,341.2890625,171.33333333333334L341.2890625,177"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M635.8515625,79.0876210119479L688.8528645833334,89.73968417662326C741.8541666666666,100.3917473412986,847.8567708333334,121.6958736706493,900.8580729166666,138.01460350199133C953.859375,154.33333333333334,953.859375,165.66666666666666,953.859375,171.33333333333334L953.859375,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M936.1328125,576L936.1328125,581.6666666666666C936.1328125,587.3333333333334,936.1328125,598.6666666666666,943.00390625,611.6682393630905C949.875,624.6698120595145,963.6171875,639.3396241190289,970.48828125,646.6745301487862L977.359375,654.0094361785434"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1135.6640625,576L1135.6640625,581.6666666666666C1135.6640625,587.3333333333334,1135.6640625,598.6666666666666,1128.79296875,611.6682393630905C1121.921875,624.6698120595145,1108.1796875,639.3396241190289,1101.30859375,646.6745301487862L1094.4375,654.0094361785434"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M976.2751941568048,385L969.584797214004,390.6666666666667C962.8944002712033,396.3333333333333,949.5136063856016,407.6666666666667,942.8232094428008,419C936.1328125,430.3333333333333,936.1328125,441.6666666666667,936.1328125,447.3333333333333L936.1328125,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1095.5216808431953,385L1102.2120777859961,390.6666666666667C1108.902474728797,396.3333333333333,1122.2832686143984,407.6666666666667,1128.9736655571992,419C1135.6640625,430.3333333333333,1135.6640625,441.6666666666667,1135.6640625,447.3333333333333L1135.6640625,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M263.9372079439253,234L241.31746495327107,238.16666666666666C218.69772196261684,242.33333333333334,173.45823598130843,250.66666666666666,150.8384929906542,259C128.21875,267.3333333333333,128.21875,275.6666666666667,128.21875,279.8333333333333L128.21875,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M418.65625,234L418.65625,238.16666666666666C418.65625,242.33333333333334,418.65625,250.66666666666666,418.65625,259C418.65625,267.3333333333333,418.65625,275.6666666666667,418.65625,279.8333333333333L418.65625,284"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M588.453125,227.38329726169192L629.33984375,232.6527477180766C670.2265625,237.9221981744613,752,248.46109908723065,804.0415200745033,257.897216210282C856.0830401490066,267.3333333333333,878.3926427980132,275.6666666666667,889.5474441225165,279.8333333333333L900.7022454470199,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M960.7973860981308,234L942.9600613317757,238.16666666666666C925.1227365654205,242.33333333333334,889.4480870327103,250.66666666666666,863.6262320511233,259C837.8043770695364,267.3333333333333,821.8353166390729,275.6666666666667,813.850786423841,279.8333333333333L805.8662562086092,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1124.2353971962616,234L1130.2925184968847,238.16666666666666C1136.3496397975077,242.33333333333334,1148.4638823987539,250.66666666666666,1168.1720453660437,259.9324237270666C1187.8802083333333,269.1981807874665,1215.1822916666667,279.396361574933,1228.8333333333333,284.49545196866626L1242.484375,289.5945423623995"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1144.8633542640187,234L1153.9362587616822,238.16666666666666C1163.0091632593458,242.33333333333334,1181.1549722546729,250.66666666666666,1181.2100873621598,259C1181.265202469647,267.3333333333333,1163.2296236892937,275.6666666666667,1154.211834299117,279.8333333333333L1145.1940449089404,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M508.34375,103.55383864671438L493.3958333333333,110.12819887226199C478.4479166666667,116.70255909780958,448.5520833333333,129.85127954890478,433.6041666666667,142.09230644111906C418.65625,154.33333333333334,418.65625,165.66666666666666,418.65625,171.33333333333334L418.65625,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M713.21875,76.83800625631011L774.81640625,87.86500521359176C836.4140625,98.8920041708734,959.609375,120.9460020854367,1021.20703125,137.639667709385C1082.8046875,154.33333333333334,1082.8046875,165.66666666666666,1082.8046875,171.33333333333334L1082.8046875,177"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(781.3984375, 610)" class="edgeLabel">
+        <g transform="translate(936.1328125, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -75,7 +75,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(980.9296875, 610)" class="edgeLabel">
+        <g transform="translate(1135.6640625, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -86,7 +86,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(781.3984375, 419)" class="edgeLabel">
+        <g transform="translate(936.1328125, 419)" class="edgeLabel">
           <g transform="translate(-9.6328125, -9)" class="label">
             <foreignObject height="18" width="19.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -97,7 +97,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(980.9296875, 419)" class="edgeLabel">
+        <g transform="translate(1135.6640625, 419)" class="edgeLabel">
           <g transform="translate(-10.96875, -9)" class="label">
             <foreignObject height="18" width="21.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -108,61 +108,73 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(341.2890625, 143)" class="edgeLabel">
+        <g transform="translate(418.65625, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -173,7 +185,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(953.859375, 143)" class="edgeLabel">
+        <g transform="translate(1082.8046875, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -186,7 +198,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(881.1640625, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L7">
+        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L7">
           <g title="fruit_c" id="classId-C_0001926201868069460340-0" class="node default clickable">
             <rect height="145" width="117.078125" y="-72.5" x="-58.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
@@ -220,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(781.3984375, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L13">
+        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L13">
           <g title="apple_c" id="classId-C_0001932582371736186409-1" class="node default clickable">
             <rect height="123" width="152.640625" y="-61.5" x="-76.3203125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
@@ -249,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(980.9296875, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L16">
+        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L16">
           <g title="orange_c" id="classId-C_0001483904441065806133-2" class="node default clickable">
             <rect height="123" width="146.421875" y="-61.5" x="-73.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
@@ -278,11 +290,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.4296875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L18">
+        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L18">
           <g title="gala_apple" id="classId-C_0000399997161214328320-3" class="node default clickable">
-            <rect height="101" width="188.859375" y="-50.5" x="-94.4296875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -294,24 +306,24 @@
                   <span class="nodeLabel">gala_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 3)" height="18" width="173.859375">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 25)" height="18" width="170.3125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : float</span>
+                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(580.1484375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L24">
+        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L24">
           <g title="empire_apple" id="classId-C_0000660406972347773654-4" class="node default clickable">
-            <rect height="101" width="188.859375" y="-50.5" x="-94.4296875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -323,24 +335,24 @@
                   <span class="nodeLabel">empire_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 3)" height="18" width="173.859375">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 25)" height="18" width="170.3125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : float</span>
+                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1182.1796875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L30">
+        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L30">
           <g title="lima_orange" id="classId-C_0001649295452510454080-5" class="node default clickable">
-            <rect height="101" width="188.859375" y="-50.5" x="-94.4296875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -352,24 +364,24 @@
                   <span class="nodeLabel">lima_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 3)" height="18" width="164.09375">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : float</span>
+                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 25)" height="18" width="173.859375">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(341.2890625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L36">
+        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L36">
           <g title="valencia_orange" id="classId-C_0000802727760415733923-6" class="node default clickable">
-            <rect height="101" width="188.859375" y="-50.5" x="-94.4296875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="94.4296875" x1="-94.4296875" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -381,20 +393,20 @@
                   <span class="nodeLabel">valencia_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 3)" height="18" width="164.09375">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : float</span>
+                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -86.9296875, 25)" height="18" width="173.859375">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(881.1640625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0002301786483822933456-7" class="node default clickable">
             <rect height="101" width="313.171875" y="-50.5" x="-156.5859375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="156.5859375" x1="-156.5859375" class="divider"/>
@@ -410,20 +422,20 @@
                   <span class="nodeLabel">fruit_factory&lt;apple_c TA,orange_c TO&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="144.828125">
+              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="196.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_apple() : TA</span>
+                  <span class="nodeLabel">+create_apple() : [const] TA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="158.171875">
+              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="209.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_orange() : TO</span>
+                  <span class="nodeLabel">+create_orange() : [const] TO</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(341.2890625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42">
+        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000551278102444647278-8" class="node default clickable">
             <rect height="57" width="339.59375" y="-28.5" x="-169.796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="169.796875" x1="-169.796875" class="divider"/>
@@ -442,7 +454,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(953.859375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000536390279563541226-9" class="node default clickable">
             <rect height="57" width="328.90625" y="-28.5" x="-164.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="164.453125" x1="-164.453125" class="divider"/>
@@ -461,7 +473,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(533.4140625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00059/t00059.cc#L51">
+        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00059/t00059.cc#L51">
           <g title="R" id="classId-C_0001128300671453354325-10" class="node default clickable">
             <rect height="101" width="204.875" y="-50.5" x="-102.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="102.4375" x1="-102.4375" class="divider"/>
diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md
index e1fb78b0..e61d106c 100644
--- a/docs/test_cases/t00060.md
+++ b/docs/test_cases/t00060.md
@@ -276,7 +276,7 @@ template <typename T, typename P> struct H : public G<T> {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index 1e463841..26bf27a9 100644
--- a/docs/test_cases/t00060_class.svg
+++ b/docs/test_cases/t00060_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="340px" preserveAspectRatio="none" style="width:254px;height:340px;" version="1.1" viewBox="0 0 254 340" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcd3ppdl2bcei" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19foeasqcic7e" 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"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
       <ellipse cx="76" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.9688,36.1406 Q78.3906,36.4375 77.75,36.5781 Q77.1094,36.7344 76.4063,36.7344 Q73.9063,36.7344 72.5781,35.0938 Q71.2656,33.4375 71.2656,30.3125 Q71.2656,27.1875 72.5781,25.5313 Q73.9063,23.875 76.4063,23.875 Q77.1094,23.875 77.75,24.0313 Q78.4063,24.1875 78.9688,24.4844 L78.9688,27.2031 Q78.3438,26.625 77.75,26.3594 Q77.1563,26.0781 76.5313,26.0781 Q75.1875,26.0781 74.5,27.1563 Q73.8125,28.2188 73.8125,30.3125 Q73.8125,32.4063 74.5,33.4844 Q75.1875,34.5469 76.5313,34.5469 Q77.1563,34.5469 77.75,34.2813 Q78.3438,34 78.9688,33.4219 L78.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="90" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
       <ellipse cx="21" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,180.6406 Q23.3906,180.9375 22.75,181.0781 Q22.1094,181.2344 21.4063,181.2344 Q18.9063,181.2344 17.5781,179.5938 Q16.2656,177.9375 16.2656,174.8125 Q16.2656,171.6875 17.5781,170.0313 Q18.9063,168.375 21.4063,168.375 Q22.1094,168.375 22.75,168.5313 Q23.4063,168.6875 23.9688,168.9844 L23.9688,171.7031 Q23.3438,171.125 22.75,170.8594 Q22.1563,170.5781 21.5313,170.5781 Q20.1875,170.5781 19.5,171.6563 Q18.8125,172.7188 18.8125,174.8125 Q18.8125,176.9063 19.5,177.9844 Q20.1875,179.0469 21.5313,179.0469 Q22.1563,179.0469 22.75,178.7813 Q23.3438,178.5 23.9688,177.9219 L23.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="179.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
       <ellipse cx="96" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,180.6406 Q98.3906,180.9375 97.75,181.0781 Q97.1094,181.2344 96.4063,181.2344 Q93.9063,181.2344 92.5781,179.5938 Q91.2656,177.9375 91.2656,174.8125 Q91.2656,171.6875 92.5781,170.0313 Q93.9063,168.375 96.4063,168.375 Q97.1094,168.375 97.75,168.5313 Q98.4063,168.6875 98.9688,168.9844 L98.9688,171.7031 Q98.3438,171.125 97.75,170.8594 Q97.1563,170.5781 96.5313,170.5781 Q95.1875,170.5781 94.5,171.6563 Q93.8125,172.7188 93.8125,174.8125 Q93.8125,176.9063 94.5,177.9844 Q95.1875,179.0469 96.5313,179.0469 Q97.1563,179.0469 97.75,178.7813 Q98.3438,178.5 98.9688,177.9219 L98.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="179.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
       <ellipse cx="57.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.4688,302.6406 Q59.8906,302.9375 59.25,303.0781 Q58.6094,303.2344 57.9063,303.2344 Q55.4063,303.2344 54.0781,301.5938 Q52.7656,299.9375 52.7656,296.8125 Q52.7656,293.6875 54.0781,292.0313 Q55.4063,290.375 57.9063,290.375 Q58.6094,290.375 59.25,290.5313 Q59.9063,290.6875 60.4688,290.9844 L60.4688,293.7031 Q59.8438,293.125 59.25,292.8594 Q58.6563,292.5781 58.0313,292.5781 Q56.6875,292.5781 56,293.6563 Q55.3125,294.7188 55.3125,296.8125 Q55.3125,298.9063 56,299.9844 Q56.6875,301.0469 58.0313,301.0469 Q58.6563,301.0469 59.25,300.7813 Q59.8438,300.5 60.4688,299.9219 L60.4688,302.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="71.5" y="301.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="313" y2="313"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="321" y2="321"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
       <ellipse cx="151" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,29.6406 Q153.3906,29.9375 152.75,30.0781 Q152.1094,30.2344 151.4063,30.2344 Q148.9063,30.2344 147.5781,28.5938 Q146.2656,26.9375 146.2656,23.8125 Q146.2656,20.6875 147.5781,19.0313 Q148.9063,17.375 151.4063,17.375 Q152.1094,17.375 152.75,17.5313 Q153.4063,17.6875 153.9688,17.9844 L153.9688,20.7031 Q153.3438,20.125 152.75,19.8594 Q152.1563,19.5781 151.5313,19.5781 Q150.1875,19.5781 149.5,20.6563 Q148.8125,21.7188 148.8125,23.8125 Q148.8125,25.9063 149.5,26.9844 Q150.1875,28.0469 151.5313,28.0469 Q152.1563,28.0469 152.75,27.7813 Q153.3438,27.5 153.9688,26.9219 L153.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="165" y="28.1543">G</text>
@@ -51,15 +51,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142" y="54"/>
       <ellipse cx="147" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="156" y="62.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd3ppdl2bcei)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19foeasqcic7e)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
       <ellipse cx="183.7" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.6688,167.6406 Q186.0906,167.9375 185.45,168.0781 Q184.8094,168.2344 184.1063,168.2344 Q181.6063,168.2344 180.2781,166.5938 Q178.9656,164.9375 178.9656,161.8125 Q178.9656,158.6875 180.2781,157.0313 Q181.6063,155.375 184.1063,155.375 Q184.8094,155.375 185.45,155.5313 Q186.1063,155.6875 186.6688,155.9844 L186.6688,158.7031 Q186.0438,158.125 185.45,157.8594 Q184.8563,157.5781 184.2313,157.5781 Q182.8875,157.5781 182.2,158.6563 Q181.5125,159.7188 181.5125,161.8125 Q181.5125,163.9063 182.2,164.9844 Q182.8875,166.0469 184.2313,166.0469 Q184.8563,166.0469 185.45,165.7813 Q186.0438,165.5 186.6688,164.9219 L186.6688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.3" y="166.1543">H</text>
@@ -68,18 +68,18 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="192"/>
       <ellipse cx="172.5" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="181.5" y="200.2104">h : G&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="204.8047"/>
       <ellipse cx="172.5" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="213.0151">hh : P</text>
     </a>
     <path d="M64.83,81.38 C55.08,106.65 43.02,137.89 34.96,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg
index 695cc8e3..becd2acf 100644
--- a/docs/test_cases/t00060_class_mermaid.svg
+++ b/docs/test_cases/t00060_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.609375 371" style="max-width: 256.609px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.609375 371" style="max-width: 256.609px; background-color: white;" width="256.609375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -116,7 +116,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L3">
+        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L3">
           <g title="A" id="classId-C_0001373615549846303472-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -135,7 +135,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L4">
+        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L4">
           <g title="B" id="classId-C_0000479650368930934571-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L5">
+        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L5">
           <g title="C" id="classId-C_0001827660844127264787-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L6">
+        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L6">
           <g title="D" id="classId-C_0001629687372290281981-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L10">
+        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L10">
           <g title="G" id="classId-C_0001877304825033069517-4" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -216,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00060/t00060.cc#L14">
+        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00060/t00060.cc#L14">
           <g title="H" id="classId-C_0001881610349123495638-5" class="node default clickable">
             <rect height="101" width="87.484375" y="-50.5" x="-43.7421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="43.7421875" x1="-43.7421875" class="divider"/>
diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md
index 1b36841c..724a81fc 100644
--- a/docs/test_cases/t00061.md
+++ b/docs/test_cases/t00061.md
@@ -65,7 +65,7 @@ struct C {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg
index d774201d..8046e1bc 100644
--- a/docs/test_cases/t00061_class.svg
+++ b/docs/test_cases/t00061_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="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fx1zkwyal1u1q" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhdz2yqjewpai" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fx1zkwyal1u1q)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhdz2yqjewpai)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg
index 391fd60b..49afa2f4 100644
--- a/docs/test_cases/t00061_class_mermaid.svg
+++ b/docs/test_cases/t00061_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00061/include/t00061_a.h#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00061/include/t00061_a.h#L3">
           <g title="A" id="classId-C_0001010204727957329423-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md
index 1ed843b8..41d848ac 100644
--- a/docs/test_cases/t00062.md
+++ b/docs/test_cases/t00062.md
@@ -1372,7 +1372,7 @@ struct A<C<T, Args...>> {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg
index ab0031a9..c2263d8e 100644
--- a/docs/test_cases/t00062_class.svg
+++ b/docs/test_cases/t00062_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="1285px" preserveAspectRatio="none" style="width:1087px;height:1285px;" version="1.1" viewBox="0 0 1087 1285" width="1087px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f64lrtqhvlw2x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpzmtrg2ekcer" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
       <ellipse cx="828.45" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M831.4188,1235.6406 Q830.8406,1235.9375 830.2,1236.0781 Q829.5594,1236.2344 828.8563,1236.2344 Q826.3563,1236.2344 825.0281,1234.5938 Q823.7156,1232.9375 823.7156,1229.8125 Q823.7156,1226.6875 825.0281,1225.0313 Q826.3563,1223.375 828.8563,1223.375 Q829.5594,1223.375 830.2,1223.5313 Q830.8563,1223.6875 831.4188,1223.9844 L831.4188,1226.7031 Q830.7938,1226.125 830.2,1225.8594 Q829.6063,1225.5781 828.9813,1225.5781 Q827.6375,1225.5781 826.95,1226.6563 Q826.2625,1227.7188 826.2625,1229.8125 Q826.2625,1231.9063 826.95,1232.9844 Q827.6375,1234.0469 828.9813,1234.0469 Q829.6063,1234.0469 830.2,1233.7813 Q830.7938,1233.5 831.4188,1232.9219 L831.4188,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="842.55" y="1234.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="819" y="1260"/>
       <ellipse cx="824" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="833" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
       <ellipse cx="480" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M482.9688,1235.6406 Q482.3906,1235.9375 481.75,1236.0781 Q481.1094,1236.2344 480.4063,1236.2344 Q477.9063,1236.2344 476.5781,1234.5938 Q475.2656,1232.9375 475.2656,1229.8125 Q475.2656,1226.6875 476.5781,1225.0313 Q477.9063,1223.375 480.4063,1223.375 Q481.1094,1223.375 481.75,1223.5313 Q482.4063,1223.6875 482.9688,1223.9844 L482.9688,1226.7031 Q482.3438,1226.125 481.75,1225.8594 Q481.1563,1225.5781 480.5313,1225.5781 Q479.1875,1225.5781 478.5,1226.6563 Q477.8125,1227.7188 477.8125,1229.8125 Q477.8125,1231.9063 478.5,1232.9844 Q479.1875,1234.0469 480.5313,1234.0469 Q481.1563,1234.0469 481.75,1233.7813 Q482.3438,1233.5 482.9688,1232.9219 L482.9688,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494" y="1234.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="471" y="1260"/>
       <ellipse cx="476" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="485" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
       <ellipse cx="21" cy="1236.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,1242.1406 Q23.3906,1242.4375 22.75,1242.5781 Q22.1094,1242.7344 21.4063,1242.7344 Q18.9063,1242.7344 17.5781,1241.0938 Q16.2656,1239.4375 16.2656,1236.3125 Q16.2656,1233.1875 17.5781,1231.5313 Q18.9063,1229.875 21.4063,1229.875 Q22.1094,1229.875 22.75,1230.0313 Q23.4063,1230.1875 23.9688,1230.4844 L23.9688,1233.2031 Q23.3438,1232.625 22.75,1232.3594 Q22.1563,1232.0781 21.5313,1232.0781 Q20.1875,1232.0781 19.5,1233.1563 Q18.8125,1234.2188 18.8125,1236.3125 Q18.8125,1238.4063 19.5,1239.4844 Q20.1875,1240.5469 21.5313,1240.5469 Q22.1563,1240.5469 22.75,1240.2813 Q23.3438,1240 23.9688,1239.4219 L23.9688,1242.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="1240.6543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1252.5" y2="1252.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1260.5" y2="1260.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
       <ellipse cx="825" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M827.9688,29.6406 Q827.3906,29.9375 826.75,30.0781 Q826.1094,30.2344 825.4063,30.2344 Q822.9063,30.2344 821.5781,28.5938 Q820.2656,26.9375 820.2656,23.8125 Q820.2656,20.6875 821.5781,19.0313 Q822.9063,17.375 825.4063,17.375 Q826.1094,17.375 826.75,17.5313 Q827.4063,17.6875 827.9688,17.9844 L827.9688,20.7031 Q827.3438,20.125 826.75,19.8594 Q826.1563,19.5781 825.5313,19.5781 Q824.1875,19.5781 823.5,20.6563 Q822.8125,21.7188 822.8125,23.8125 Q822.8125,25.9063 823.5,26.9844 Q824.1875,28.0469 825.5313,28.0469 Q826.1563,28.0469 826.75,27.7813 Q827.3438,27.5 827.9688,26.9219 L827.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="839" y="28.1543">A</text>
@@ -63,15 +63,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="816" y="54"/>
       <ellipse cx="821" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="830" y="62.2104">u : U **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
       <ellipse cx="524.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.4688,29.6406 Q526.8906,29.9375 526.25,30.0781 Q525.6094,30.2344 524.9063,30.2344 Q522.4063,30.2344 521.0781,28.5938 Q519.7656,26.9375 519.7656,23.8125 Q519.7656,20.6875 521.0781,19.0313 Q522.4063,17.375 524.9063,17.375 Q525.6094,17.375 526.25,17.5313 Q526.9063,17.6875 527.4688,17.9844 L527.4688,20.7031 Q526.8438,20.125 526.25,19.8594 Q525.6563,19.5781 525.0313,19.5781 Q523.6875,19.5781 523,20.6563 Q522.3125,21.7188 522.3125,23.8125 Q522.3125,25.9063 523,26.9844 Q523.6875,28.0469 525.0313,28.0469 Q525.6563,28.0469 526.25,27.7813 Q526.8438,27.5 527.4688,26.9219 L527.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="538.5" y="28.1543">A</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="515.5" y="54"/>
       <ellipse cx="520.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="529.5" y="62.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
       <ellipse cx="746" cy="120" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M748.9688,125.6406 Q748.3906,125.9375 747.75,126.0781 Q747.1094,126.2344 746.4063,126.2344 Q743.9063,126.2344 742.5781,124.5938 Q741.2656,122.9375 741.2656,119.8125 Q741.2656,116.6875 742.5781,115.0313 Q743.9063,113.375 746.4063,113.375 Q747.1094,113.375 747.75,113.5313 Q748.4063,113.6875 748.9688,113.9844 L748.9688,116.7031 Q748.3438,116.125 747.75,115.8594 Q747.1563,115.5781 746.5313,115.5781 Q745.1875,115.5781 744.5,116.6563 Q743.8125,117.7188 743.8125,119.8125 Q743.8125,121.9063 744.5,122.9844 Q745.1875,124.0469 746.5313,124.0469 Q747.1563,124.0469 747.75,123.7813 Q748.3438,123.5 748.9688,122.9219 L748.9688,125.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="760" y="124.1543">A</text>
@@ -97,15 +97,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="136" y2="136"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="144" y2="144"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="737" y="150"/>
       <ellipse cx="742" cy="155" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="751" y="158.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
       <ellipse cx="823.9" cy="216" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.8688,221.6406 Q826.2906,221.9375 825.65,222.0781 Q825.0094,222.2344 824.3063,222.2344 Q821.8063,222.2344 820.4781,220.5938 Q819.1656,218.9375 819.1656,215.8125 Q819.1656,212.6875 820.4781,211.0313 Q821.8063,209.375 824.3063,209.375 Q825.0094,209.375 825.65,209.5313 Q826.3063,209.6875 826.8688,209.9844 L826.8688,212.7031 Q826.2438,212.125 825.65,211.8594 Q825.0563,211.5781 824.4313,211.5781 Q823.0875,211.5781 822.4,212.6563 Q821.7125,213.7188 821.7125,215.8125 Q821.7125,217.9063 822.4,218.9844 Q823.0875,220.0469 824.4313,220.0469 Q825.0563,220.0469 825.65,219.7813 Q826.2438,219.5 826.8688,218.9219 L826.8688,221.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838.1" y="220.1543">A</text>
@@ -114,15 +114,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="232" y2="232"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="814" y="246"/>
       <ellipse cx="819" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="828" y="254.2104">u : U &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
       <ellipse cx="811.4" cy="312" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M814.3688,317.6406 Q813.7906,317.9375 813.15,318.0781 Q812.5094,318.2344 811.8063,318.2344 Q809.3063,318.2344 807.9781,316.5938 Q806.6656,314.9375 806.6656,311.8125 Q806.6656,308.6875 807.9781,307.0313 Q809.3063,305.375 811.8063,305.375 Q812.5094,305.375 813.15,305.5313 Q813.8063,305.6875 814.3688,305.9844 L814.3688,308.7031 Q813.7438,308.125 813.15,307.8594 Q812.5563,307.5781 811.9313,307.5781 Q810.5875,307.5781 809.9,308.6563 Q809.2125,309.7188 809.2125,311.8125 Q809.2125,313.9063 809.9,314.9844 Q810.5875,316.0469 811.9313,316.0469 Q812.5563,316.0469 813.15,315.7813 Q813.7438,315.5 814.3688,314.9219 L814.3688,317.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.6" y="316.1543">A</text>
@@ -131,15 +131,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="328" y2="328"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="342"/>
       <ellipse cx="806.5" cy="347" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="815.5" y="350.2104">u : const U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
       <ellipse cx="821.3" cy="408.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.2688,414.1406 Q823.6906,414.4375 823.05,414.5781 Q822.4094,414.7344 821.7063,414.7344 Q819.2063,414.7344 817.8781,413.0938 Q816.5656,411.4375 816.5656,408.3125 Q816.5656,405.1875 817.8781,403.5313 Q819.2063,401.875 821.7063,401.875 Q822.4094,401.875 823.05,402.0313 Q823.7063,402.1875 824.2688,402.4844 L824.2688,405.2031 Q823.6438,404.625 823.05,404.3594 Q822.4563,404.0781 821.8313,404.0781 Q820.4875,404.0781 819.8,405.1563 Q819.1125,406.2188 819.1125,408.3125 Q819.1125,410.4063 819.8,411.4844 Q820.4875,412.5469 821.8313,412.5469 Q822.4563,412.5469 823.05,412.2813 Q823.6438,412 824.2688,411.4219 L824.2688,414.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.7" y="412.6543">A</text>
@@ -148,22 +148,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="424.5" y2="424.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="432.5" y2="432.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="438.5"/>
       <ellipse cx="815.5" cy="443.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="824.5" y="446.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="451.3047"/>
       <ellipse cx="815.5" cy="456.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="824.5" y="459.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
       <ellipse cx="532" cy="165.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M534.9688,171.1406 Q534.3906,171.4375 533.75,171.5781 Q533.1094,171.7344 532.4063,171.7344 Q529.9063,171.7344 528.5781,170.0938 Q527.2656,168.4375 527.2656,165.3125 Q527.2656,162.1875 528.5781,160.5313 Q529.9063,158.875 532.4063,158.875 Q533.1094,158.875 533.75,159.0313 Q534.4063,159.1875 534.9688,159.4844 L534.9688,162.2031 Q534.3438,161.625 533.75,161.3594 Q533.1563,161.0781 532.5313,161.0781 Q531.1875,161.0781 530.5,162.1563 Q529.8125,163.2188 529.8125,165.3125 Q529.8125,167.4063 530.5,168.4844 Q531.1875,169.5469 532.5313,169.5469 Q533.1563,169.5469 533.75,169.2813 Q534.3438,169 534.9688,168.4219 L534.9688,171.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="546" y="169.6543">A</text>
@@ -172,22 +172,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="181.5" y2="181.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="189.5" y2="189.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="195.5"/>
       <ellipse cx="528" cy="200.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="537" y="203.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="208.3047"/>
       <ellipse cx="528" cy="213.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="537" y="216.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
       <ellipse cx="801" cy="517.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M803.9688,523.1406 Q803.3906,523.4375 802.75,523.5781 Q802.1094,523.7344 801.4063,523.7344 Q798.9063,523.7344 797.5781,522.0938 Q796.2656,520.4375 796.2656,517.3125 Q796.2656,514.1875 797.5781,512.5313 Q798.9063,510.875 801.4063,510.875 Q802.1094,510.875 802.75,511.0313 Q803.4063,511.1875 803.9688,511.4844 L803.9688,514.2031 Q803.3438,513.625 802.75,513.3594 Q802.1563,513.0781 801.5313,513.0781 Q800.1875,513.0781 799.5,514.1563 Q798.8125,515.2188 798.8125,517.3125 Q798.8125,519.4063 799.5,520.4844 Q800.1875,521.5469 801.5313,521.5469 Q802.1563,521.5469 802.75,521.2813 Q803.3438,521 803.9688,520.4219 L803.9688,523.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="815" y="521.6543">A</text>
@@ -196,22 +196,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="533.5" y2="533.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="541.5" y2="541.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="547.5"/>
       <ellipse cx="797" cy="552.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="806" y="555.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="560.3047"/>
       <ellipse cx="797" cy="565.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="806" y="568.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
       <ellipse cx="516.5" cy="524" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.4688,529.6406 Q518.8906,529.9375 518.25,530.0781 Q517.6094,530.2344 516.9063,530.2344 Q514.4063,530.2344 513.0781,528.5938 Q511.7656,526.9375 511.7656,523.8125 Q511.7656,520.6875 513.0781,519.0313 Q514.4063,517.375 516.9063,517.375 Q517.6094,517.375 518.25,517.5313 Q518.9063,517.6875 519.4688,517.9844 L519.4688,520.7031 Q518.8438,520.125 518.25,519.8594 Q517.6563,519.5781 517.0313,519.5781 Q515.6875,519.5781 515,520.6563 Q514.3125,521.7188 514.3125,523.8125 Q514.3125,525.9063 515,526.9844 Q515.6875,528.0469 517.0313,528.0469 Q517.6563,528.0469 518.25,527.7813 Q518.8438,527.5 519.4688,526.9219 L519.4688,529.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="530.5" y="528.1543">A</text>
@@ -220,15 +220,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="540" y2="540"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="548" y2="548"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="507.5" y="554"/>
       <ellipse cx="512.5" cy="559" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="521.5" y="562.2104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
       <ellipse cx="511.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M514.4688,280.1406 Q513.8906,280.4375 513.25,280.5781 Q512.6094,280.7344 511.9063,280.7344 Q509.4063,280.7344 508.0781,279.0938 Q506.7656,277.4375 506.7656,274.3125 Q506.7656,271.1875 508.0781,269.5313 Q509.4063,267.875 511.9063,267.875 Q512.6094,267.875 513.25,268.0313 Q513.9063,268.1875 514.4688,268.4844 L514.4688,271.2031 Q513.8438,270.625 513.25,270.3594 Q512.6563,270.0781 512.0313,270.0781 Q510.6875,270.0781 510,271.1563 Q509.3125,272.2188 509.3125,274.3125 Q509.3125,276.4063 510,277.4844 Q510.6875,278.5469 512.0313,278.5469 Q512.6563,278.5469 513.25,278.2813 Q513.8438,278 514.4688,277.4219 L514.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="525.5" y="278.6543">A</text>
@@ -237,22 +237,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="304.5"/>
       <ellipse cx="507.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="516.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="317.3047"/>
       <ellipse cx="507.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="516.5" y="325.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
       <ellipse cx="142.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.4688,280.1406 Q144.8906,280.4375 144.25,280.5781 Q143.6094,280.7344 142.9063,280.7344 Q140.4063,280.7344 139.0781,279.0938 Q137.7656,277.4375 137.7656,274.3125 Q137.7656,271.1875 139.0781,269.5313 Q140.4063,267.875 142.9063,267.875 Q143.6094,267.875 144.25,268.0313 Q144.9063,268.1875 145.4688,268.4844 L145.4688,271.2031 Q144.8438,270.625 144.25,270.3594 Q143.6563,270.0781 143.0313,270.0781 Q141.6875,270.0781 141,271.1563 Q140.3125,272.2188 140.3125,274.3125 Q140.3125,276.4063 141,277.4844 Q141.6875,278.5469 143.0313,278.5469 Q143.6563,278.5469 144.25,278.2813 Q144.8438,278 145.4688,277.4219 L145.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="278.6543">A</text>
@@ -261,22 +261,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="304.5"/>
       <ellipse cx="138.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="147.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="317.3047"/>
       <ellipse cx="138.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="147.5" y="325.5151">mf : float C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
       <ellipse cx="764" cy="626.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M766.9688,632.1406 Q766.3906,632.4375 765.75,632.5781 Q765.1094,632.7344 764.4063,632.7344 Q761.9063,632.7344 760.5781,631.0938 Q759.2656,629.4375 759.2656,626.3125 Q759.2656,623.1875 760.5781,621.5313 Q761.9063,619.875 764.4063,619.875 Q765.1094,619.875 765.75,620.0313 Q766.4063,620.1875 766.9688,620.4844 L766.9688,623.2031 Q766.3438,622.625 765.75,622.3594 Q765.1563,622.0781 764.5313,622.0781 Q763.1875,622.0781 762.5,623.1563 Q761.8125,624.2188 761.8125,626.3125 Q761.8125,628.4063 762.5,629.4844 Q763.1875,630.5469 764.5313,630.5469 Q765.1563,630.5469 765.75,630.2813 Q766.3438,630 766.9688,629.4219 L766.9688,632.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="778" y="630.6543">A</text>
@@ -285,22 +285,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="642.5" y2="642.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="650.5" y2="650.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="656.5"/>
       <ellipse cx="760" cy="661.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="769" y="664.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="669.3047"/>
       <ellipse cx="760" cy="674.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="769" y="677.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
       <ellipse cx="816" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M818.9688,741.6406 Q818.3906,741.9375 817.75,742.0781 Q817.1094,742.2344 816.4063,742.2344 Q813.9063,742.2344 812.5781,740.5938 Q811.2656,738.9375 811.2656,735.8125 Q811.2656,732.6875 812.5781,731.0313 Q813.9063,729.375 816.4063,729.375 Q817.1094,729.375 817.75,729.5313 Q818.4063,729.6875 818.9688,729.9844 L818.9688,732.7031 Q818.3438,732.125 817.75,731.8594 Q817.1563,731.5781 816.5313,731.5781 Q815.1875,731.5781 814.5,732.6563 Q813.8125,733.7188 813.8125,735.8125 Q813.8125,737.9063 814.5,738.9844 Q815.1875,740.0469 816.5313,740.0469 Q817.1563,740.0469 817.75,739.7813 Q818.3438,739.5 818.9688,738.9219 L818.9688,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="830" y="740.1543">A</text>
@@ -309,15 +309,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="807" y="766"/>
       <ellipse cx="812" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="821" y="774.2104">n : char[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
       <ellipse cx="524.25" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.2188,741.6406 Q526.6406,741.9375 526,742.0781 Q525.3594,742.2344 524.6563,742.2344 Q522.1563,742.2344 520.8281,740.5938 Q519.5156,738.9375 519.5156,735.8125 Q519.5156,732.6875 520.8281,731.0313 Q522.1563,729.375 524.6563,729.375 Q525.3594,729.375 526,729.5313 Q526.6563,729.6875 527.2188,729.9844 L527.2188,732.7031 Q526.5938,732.125 526,731.8594 Q525.4063,731.5781 524.7813,731.5781 Q523.4375,731.5781 522.75,732.6563 Q522.0625,733.7188 522.0625,735.8125 Q522.0625,737.9063 522.75,738.9844 Q523.4375,740.0469 524.7813,740.0469 Q525.4063,740.0469 526,739.7813 Q526.5938,739.5 527.2188,738.9219 L527.2188,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541.75" y="740.1543">A</text>
@@ -326,15 +326,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="499.5" y="766"/>
       <ellipse cx="504.5" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="513.5" y="774.2104">n : std::vector&lt;char&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
       <ellipse cx="797.9" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,837.6406 Q800.2906,837.9375 799.65,838.0781 Q799.0094,838.2344 798.3063,838.2344 Q795.8063,838.2344 794.4781,836.5938 Q793.1656,834.9375 793.1656,831.8125 Q793.1656,828.6875 794.4781,827.0313 Q795.8063,825.375 798.3063,825.375 Q799.0094,825.375 799.65,825.5313 Q800.3063,825.6875 800.8688,825.9844 L800.8688,828.7031 Q800.2438,828.125 799.65,827.8594 Q799.0563,827.5781 798.4313,827.5781 Q797.0875,827.5781 796.4,828.6563 Q795.7125,829.7188 795.7125,831.8125 Q795.7125,833.9063 796.4,834.9844 Q797.0875,836.0469 798.4313,836.0469 Q799.0563,836.0469 799.65,835.7813 Q800.2438,835.5 800.8688,834.9219 L800.8688,837.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.1" y="836.1543">A</text>
@@ -343,15 +343,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="848" y2="848"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="856" y2="856"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="788" y="862"/>
       <ellipse cx="793" cy="867" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="802" y="870.2104">klm : char[K][L][M]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
       <ellipse cx="824" cy="928" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.9688,933.6406 Q826.3906,933.9375 825.75,934.0781 Q825.1094,934.2344 824.4063,934.2344 Q821.9063,934.2344 820.5781,932.5938 Q819.2656,930.9375 819.2656,927.8125 Q819.2656,924.6875 820.5781,923.0313 Q821.9063,921.375 824.4063,921.375 Q825.1094,921.375 825.75,921.5313 Q826.4063,921.6875 826.9688,921.9844 L826.9688,924.7031 Q826.3438,924.125 825.75,923.8594 Q825.1563,923.5781 824.5313,923.5781 Q823.1875,923.5781 822.5,924.6563 Q821.8125,925.7188 821.8125,927.8125 Q821.8125,929.9063 822.5,930.9844 Q823.1875,932.0469 824.5313,932.0469 Q825.1563,932.0469 825.75,931.7813 Q826.3438,931.5 826.9688,930.9219 L826.9688,933.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838" y="932.1543">A</text>
@@ -360,15 +360,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="944" y2="944"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="952" y2="952"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="815" y="958"/>
       <ellipse cx="820" cy="963" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="829" y="966.2104">u : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
       <ellipse cx="822" cy="1024" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.9688,1029.6406 Q824.3906,1029.9375 823.75,1030.0781 Q823.1094,1030.2344 822.4063,1030.2344 Q819.9063,1030.2344 818.5781,1028.5938 Q817.2656,1026.9375 817.2656,1023.8125 Q817.2656,1020.6875 818.5781,1019.0313 Q819.9063,1017.375 822.4063,1017.375 Q823.1094,1017.375 823.75,1017.5313 Q824.4063,1017.6875 824.9688,1017.9844 L824.9688,1020.7031 Q824.3438,1020.125 823.75,1019.8594 Q823.1563,1019.5781 822.5313,1019.5781 Q821.1875,1019.5781 820.5,1020.6563 Q819.8125,1021.7188 819.8125,1023.8125 Q819.8125,1025.9063 820.5,1026.9844 Q821.1875,1028.0469 822.5313,1028.0469 Q823.1563,1028.0469 823.75,1027.7813 Q824.3438,1027.5 824.9688,1026.9219 L824.9688,1029.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="836" y="1028.1543">A</text>
@@ -377,15 +377,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1040" y2="1040"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1048" y2="1048"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813" y="1054"/>
       <ellipse cx="818" cy="1059" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="827" y="1062.2104">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
       <ellipse cx="797.9" cy="1120.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,1126.1406 Q800.2906,1126.4375 799.65,1126.5781 Q799.0094,1126.7344 798.3063,1126.7344 Q795.8063,1126.7344 794.4781,1125.0938 Q793.1656,1123.4375 793.1656,1120.3125 Q793.1656,1117.1875 794.4781,1115.5313 Q795.8063,1113.875 798.3063,1113.875 Q799.0094,1113.875 799.65,1114.0313 Q800.3063,1114.1875 800.8688,1114.4844 L800.8688,1117.2031 Q800.2438,1116.625 799.65,1116.3594 Q799.0563,1116.0781 798.4313,1116.0781 Q797.0875,1116.0781 796.4,1117.1563 Q795.7125,1118.2188 795.7125,1120.3125 Q795.7125,1122.4063 796.4,1123.4844 Q797.0875,1124.5469 798.4313,1124.5469 Q799.0563,1124.5469 799.65,1124.2813 Q800.2438,1124 800.8688,1123.4219 L800.8688,1126.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="817.1" y="1124.6543">A</text>
@@ -394,22 +394,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1136.5" y2="1136.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1144.5" y2="1144.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1150.5"/>
       <ellipse cx="770.5" cy="1155.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="779.5" y="1158.7104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1163.3047"/>
       <ellipse cx="770.5" cy="1168.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="779.5" y="1171.5151">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f64lrtqhvlw2x)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpzmtrg2ekcer)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
       <ellipse cx="1037" cy="639.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1039.9688,645.1406 Q1039.3906,645.4375 1038.75,645.5781 Q1038.1094,645.7344 1037.4063,645.7344 Q1034.9063,645.7344 1033.5781,644.0938 Q1032.2656,642.4375 1032.2656,639.3125 Q1032.2656,636.1875 1033.5781,634.5313 Q1034.9063,632.875 1037.4063,632.875 Q1038.1094,632.875 1038.75,633.0313 Q1039.4063,633.1875 1039.9688,633.4844 L1039.9688,636.2031 Q1039.3438,635.625 1038.75,635.3594 Q1038.1563,635.0781 1037.5313,635.0781 Q1036.1875,635.0781 1035.5,636.1563 Q1034.8125,637.2188 1034.8125,639.3125 Q1034.8125,641.4063 1035.5,642.4844 Q1036.1875,643.5469 1037.5313,643.5469 Q1038.1563,643.5469 1038.75,643.2813 Q1039.3438,643 1039.9688,642.4219 L1039.9688,645.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1051" y="643.6543">A</text>
diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg
index 77bd43c5..3cdf9b07 100644
--- a/docs/test_cases/t00062_class_mermaid.svg
+++ b/docs/test_cases/t00062_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2641.2578125 526" style="max-width: 2641.26px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2641.2578125 526" style="max-width: 2641.26px; background-color: white;" width="2641.2578125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -73,198 +73,240 @@
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M2533.9296875,411L2533.9296875,415.1666666666667C2533.9296875,419.3333333333333,2533.9296875,427.6666666666667,2351.59375,440.531299269734C2169.2578125,453.3959318728014,1804.5859375,470.79186374560277,1622.25,479.4898296820034L1439.9140625,488.1877956184041"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L9">
+        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L9">
           <g title="A" id="classId-C_0001046827200300090710-0" class="node default clickable">
             <rect height="79" width="73.25" y="-39.5" x="-36.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.625" x1="-36.625" class="divider"/>
@@ -288,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L13">
+        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L13">
           <g title="A" id="classId-C_0001099548178945911245-1" class="node default clickable">
             <rect height="79" width="242.59375" y="-39.5" x="-121.296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.296875" x1="-121.296875" class="divider"/>
@@ -312,7 +354,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L18">
+        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L18">
           <g title="A" id="classId-C_0001239388209995793547-2" class="node default clickable">
             <rect height="57" width="479.921875" y="-28.5" x="-239.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="239.9609375" x1="-239.9609375" class="divider"/>
@@ -331,7 +373,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L20">
+        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L20">
           <g title="A" id="classId-C_0000045701897814162098-3" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -355,7 +397,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L24">
+        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L24">
           <g title="A" id="classId-C_0001379193770802992785-4" class="node default clickable">
             <rect height="79" width="131.484375" y="-39.5" x="-65.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.7421875" x1="-65.7421875" class="divider"/>
@@ -379,7 +421,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L28">
+        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L28">
           <g title="A" id="classId-C_0001407865337446777280-5" class="node default clickable">
             <rect height="79" width="276.421875" y="-39.5" x="-138.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="138.2109375" x1="-138.2109375" class="divider"/>
@@ -403,7 +445,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L32">
+        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L32">
           <g title="A" id="classId-C_0001034483227649400416-6" class="node default clickable">
             <rect height="79" width="84.359375" y="-39.5" x="-42.1796875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.1796875" x1="-42.1796875" class="divider"/>
@@ -427,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L36">
+        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L36">
           <g title="A" id="classId-C_0000352457857519671117-7" class="node default clickable">
             <rect height="79" width="115.9375" y="-39.5" x="-57.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="57.96875" x1="-57.96875" class="divider"/>
@@ -451,7 +493,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L40">
+        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L40">
           <g title="A" id="classId-C_0000314708288320430272-8" class="node default clickable">
             <rect height="101" width="91.453125" y="-50.5" x="-45.7265625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="45.7265625" x1="-45.7265625" class="divider"/>
@@ -480,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L45">
+        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L45">
           <g title="A" id="classId-C_0000827753335392390402-9" class="node default clickable">
             <rect height="101" width="119.015625" y="-50.5" x="-59.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.5078125" x1="-59.5078125" class="divider"/>
@@ -509,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L50">
+        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L50">
           <g title="A" id="classId-C_0000395583480407686249-10" class="node default clickable">
             <rect height="101" width="140.328125" y="-50.5" x="-70.1640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.1640625" x1="-70.1640625" class="divider"/>
@@ -538,7 +580,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L55">
+        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L55">
           <g title="A" id="classId-C_0000476497055497873078-11" class="node default clickable">
             <rect height="79" width="152.75" y="-39.5" x="-76.375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.375" x1="-76.375" class="divider"/>
@@ -562,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L59">
+        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L59">
           <g title="A" id="classId-C_0001619634759668095904-12" class="node default clickable">
             <rect height="101" width="167.875" y="-50.5" x="-83.9375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="83.9375" x1="-83.9375" class="divider"/>
@@ -591,7 +633,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L64">
+        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L64">
           <g title="A" id="classId-C_0001357746808315142717-13" class="node default clickable">
             <rect height="101" width="180.3125" y="-50.5" x="-90.15625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="90.15625" x1="-90.15625" class="divider"/>
@@ -620,7 +662,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L70">
+        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L70">
           <g title="A" id="classId-C_0000544335779197078982-14" class="node default clickable">
             <rect height="101" width="231.015625" y="-50.5" x="-115.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="115.5078125" x1="-115.5078125" class="divider"/>
@@ -649,7 +691,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L75">
+        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L75">
           <g title="A" id="classId-C_0000602066980416477930-15" class="node default clickable">
             <rect height="79" width="101.25" y="-39.5" x="-50.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="50.625" x1="-50.625" class="divider"/>
@@ -673,7 +715,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L79">
+        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L79">
           <g title="A" id="classId-C_0001318419672443856415-16" class="node default clickable">
             <rect height="79" width="170.203125" y="-39.5" x="-85.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="85.1015625" x1="-85.1015625" class="divider"/>
@@ -697,7 +739,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L83">
+        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L83">
           <g title="A" id="classId-C_0000599593856979463652-17" class="node default clickable">
             <rect height="79" width="153.265625" y="-39.5" x="-76.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.6328125" x1="-76.6328125" class="divider"/>
@@ -721,7 +763,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L85">
+        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L85">
           <g title="A" id="classId-C_0000015395295268000991-18" class="node default clickable">
             <rect height="79" width="80.796875" y="-39.5" x="-40.3984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.3984375" x1="-40.3984375" class="divider"/>
@@ -745,7 +787,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L89">
+        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L89">
           <g title="A" id="classId-C_0001603321863498552207-19" class="node default clickable">
             <rect height="79" width="85.703125" y="-39.5" x="-42.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.8515625" x1="-42.8515625" class="divider"/>
@@ -769,7 +811,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L95">
+        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L95">
           <g title="A" id="classId-C_0000232518961342221670-20" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -798,7 +840,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00062/t00062.cc#L7">
+        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00062/t00062.cc#L7">
           <g title="A" id="classId-C_0000121103565834936476-21" class="node default clickable">
             <rect height="57" width="55.015625" y="-28.5" x="-27.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md
index 53fbd872..03b95889 100644
--- a/docs/test_cases/t00063.md
+++ b/docs/test_cases/t00063.md
@@ -63,7 +63,7 @@ enum class C { c1, c2, c3 };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg
index 245aa97b..7a9af6e7 100644
--- a/docs/test_cases/t00063_class.svg
+++ b/docs/test_cases/t00063_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="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhgfzxk1r112t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lnj354ovedl" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhgfzxk1r112t)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnj354ovedl)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg
index 2d231a62..24fc7691 100644
--- a/docs/test_cases/t00063_class_mermaid.svg
+++ b/docs/test_cases/t00063_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00063/t00063.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00063/t00063.cc#L3">
           <g title="A" id="classId-C_0001518171774798799557-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md
index a1dcf8f9..17a44423 100644
--- a/docs/test_cases/t00064.md
+++ b/docs/test_cases/t00064.md
@@ -1036,7 +1036,7 @@ public:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg
index 330d236b..93506a95 100644
--- a/docs/test_cases/t00064_class.svg
+++ b/docs/test_cases/t00064_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="1373px" preserveAspectRatio="none" style="width:2348px;height:1373px;" version="1.1" viewBox="0 0 2348 1373" width="2348px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o6g1a8jahzkd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fr8cl3cixx0wh" 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"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
       <ellipse cx="2234.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2237.4688,592.8406 Q2236.8906,593.1375 2236.25,593.2781 Q2235.6094,593.4344 2234.9063,593.4344 Q2232.4063,593.4344 2231.0781,591.7938 Q2229.7656,590.1375 2229.7656,587.0125 Q2229.7656,583.8875 2231.0781,582.2313 Q2232.4063,580.575 2234.9063,580.575 Q2235.6094,580.575 2236.25,580.7313 Q2236.9063,580.8875 2237.4688,581.1844 L2237.4688,583.9031 Q2236.8438,583.325 2236.25,583.0594 Q2235.6563,582.7781 2235.0313,582.7781 Q2233.6875,582.7781 2233,583.8563 Q2232.3125,584.9188 2232.3125,587.0125 Q2232.3125,589.1063 2233,590.1844 Q2233.6875,591.2469 2235.0313,591.2469 Q2235.6563,591.2469 2236.25,590.9813 Q2236.8438,590.7 2237.4688,590.1219 L2237.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="2248.5" y="591.3543">type_list</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
       <ellipse cx="1788" cy="261.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1790.9688,266.8406 Q1790.3906,267.1375 1789.75,267.2781 Q1789.1094,267.4344 1788.4063,267.4344 Q1785.9063,267.4344 1784.5781,265.7938 Q1783.2656,264.1375 1783.2656,261.0125 Q1783.2656,257.8875 1784.5781,256.2313 Q1785.9063,254.575 1788.4063,254.575 Q1789.1094,254.575 1789.75,254.7313 Q1790.4063,254.8875 1790.9688,255.1844 L1790.9688,257.9031 Q1790.3438,257.325 1789.75,257.0594 Q1789.1563,256.7781 1788.5313,256.7781 Q1787.1875,256.7781 1786.5,257.8563 Q1785.8125,258.9188 1785.8125,261.0125 Q1785.8125,263.1063 1786.5,264.1844 Q1787.1875,265.2469 1788.5313,265.2469 Q1789.1563,265.2469 1789.75,264.9813 Q1790.3438,264.7 1790.9688,264.1219 L1790.9688,266.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1802" y="265.3543">type_list</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="277.2" y2="277.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="285.2" y2="285.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
       <ellipse cx="1802.5" cy="510.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1805.4688,515.8406 Q1804.8906,516.1375 1804.25,516.2781 Q1803.6094,516.4344 1802.9063,516.4344 Q1800.4063,516.4344 1799.0781,514.7938 Q1797.7656,513.1375 1797.7656,510.0125 Q1797.7656,506.8875 1799.0781,505.2313 Q1800.4063,503.575 1802.9063,503.575 Q1803.6094,503.575 1804.25,503.7313 Q1804.9063,503.8875 1805.4688,504.1844 L1805.4688,506.9031 Q1804.8438,506.325 1804.25,506.0594 Q1803.6563,505.7781 1803.0313,505.7781 Q1801.6875,505.7781 1801,506.8563 Q1800.3125,507.9188 1800.3125,510.0125 Q1800.3125,512.1063 1801,513.1844 Q1801.6875,514.2469 1803.0313,514.2469 Q1803.6563,514.2469 1804.25,513.9813 Q1804.8438,513.7 1805.4688,513.1219 L1805.4688,515.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1816.5" y="514.3543">type_list</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="526.2" y2="526.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="534.2" y2="534.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
       <ellipse cx="1804.5" cy="107.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1807.4688,112.8406 Q1806.8906,113.1375 1806.25,113.2781 Q1805.6094,113.4344 1804.9063,113.4344 Q1802.4063,113.4344 1801.0781,111.7938 Q1799.7656,110.1375 1799.7656,107.0125 Q1799.7656,103.8875 1801.0781,102.2313 Q1802.4063,100.575 1804.9063,100.575 Q1805.6094,100.575 1806.25,100.7313 Q1806.9063,100.8875 1807.4688,101.1844 L1807.4688,103.9031 Q1806.8438,103.325 1806.25,103.0594 Q1805.6563,102.7781 1805.0313,102.7781 Q1803.6875,102.7781 1803,103.8563 Q1802.3125,104.9188 1802.3125,107.0125 Q1802.3125,109.1063 1803,110.1844 Q1803.6875,111.2469 1805.0313,111.2469 Q1805.6563,111.2469 1806.25,110.9813 Q1806.8438,110.7 1807.4688,110.1219 L1807.4688,112.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1818.5" y="111.3543">type_list</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="123.2" y2="123.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="131.2" y2="131.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
       <ellipse cx="1065.5" cy="55.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1068.4688,60.8406 Q1067.8906,61.1375 1067.25,61.2781 Q1066.6094,61.4344 1065.9063,61.4344 Q1063.4063,61.4344 1062.0781,59.7938 Q1060.7656,58.1375 1060.7656,55.0125 Q1060.7656,51.8875 1062.0781,50.2313 Q1063.4063,48.575 1065.9063,48.575 Q1066.6094,48.575 1067.25,48.7313 Q1067.9063,48.8875 1068.4688,49.1844 L1068.4688,51.9031 Q1067.8438,51.325 1067.25,51.0594 Q1066.6563,50.7781 1066.0313,50.7781 Q1064.6875,50.7781 1064,51.8563 Q1063.3125,52.9188 1063.3125,55.0125 Q1063.3125,57.1063 1064,58.1844 Q1064.6875,59.2469 1066.0313,59.2469 Q1066.6563,59.2469 1067.25,58.9813 Q1067.8438,58.7 1068.4688,58.1219 L1068.4688,60.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1079.5" y="59.3543">head</text>
@@ -59,8 +59,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="71.2" y2="71.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="79.2" y2="79.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
       <ellipse cx="1818.5" cy="913.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1821.4688,918.8406 Q1820.8906,919.1375 1820.25,919.2781 Q1819.6094,919.4344 1818.9063,919.4344 Q1816.4063,919.4344 1815.0781,917.7938 Q1813.7656,916.1375 1813.7656,913.0125 Q1813.7656,909.8875 1815.0781,908.2313 Q1816.4063,906.575 1818.9063,906.575 Q1819.6094,906.575 1820.25,906.7313 Q1820.9063,906.8875 1821.4688,907.1844 L1821.4688,909.9031 Q1820.8438,909.325 1820.25,909.0594 Q1819.6563,908.7781 1819.0313,908.7781 Q1817.6875,908.7781 1817,909.8563 Q1816.3125,910.9188 1816.3125,913.0125 Q1816.3125,915.1063 1817,916.1844 Q1817.6875,917.2469 1819.0313,917.2469 Q1819.6563,917.2469 1820.25,916.9813 Q1820.8438,916.7 1821.4688,916.1219 L1821.4688,918.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1832.5" y="917.3543">type_list</text>
@@ -69,8 +69,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="929.2" y2="929.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="937.2" y2="937.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
       <ellipse cx="1820.5" cy="996.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1823.4688,1001.8406 Q1822.8906,1002.1375 1822.25,1002.2781 Q1821.6094,1002.4344 1820.9063,1002.4344 Q1818.4063,1002.4344 1817.0781,1000.7938 Q1815.7656,999.1375 1815.7656,996.0125 Q1815.7656,992.8875 1817.0781,991.2313 Q1818.4063,989.575 1820.9063,989.575 Q1821.6094,989.575 1822.25,989.7313 Q1822.9063,989.8875 1823.4688,990.1844 L1823.4688,992.9031 Q1822.8438,992.325 1822.25,992.0594 Q1821.6563,991.7781 1821.0313,991.7781 Q1819.6875,991.7781 1819,992.8563 Q1818.3125,993.9188 1818.3125,996.0125 Q1818.3125,998.1063 1819,999.1844 Q1819.6875,1000.2469 1821.0313,1000.2469 Q1821.6563,1000.2469 1822.25,999.9813 Q1822.8438,999.7 1823.4688,999.1219 L1823.4688,1001.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1834.5" y="1000.3543">type_list</text>
@@ -79,8 +79,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1012.2" y2="1012.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1020.2" y2="1020.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
       <ellipse cx="1810" cy="830.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1812.9688,835.8406 Q1812.3906,836.1375 1811.75,836.2781 Q1811.1094,836.4344 1810.4063,836.4344 Q1807.9063,836.4344 1806.5781,834.7938 Q1805.2656,833.1375 1805.2656,830.0125 Q1805.2656,826.8875 1806.5781,825.2313 Q1807.9063,823.575 1810.4063,823.575 Q1811.1094,823.575 1811.75,823.7313 Q1812.4063,823.8875 1812.9688,824.1844 L1812.9688,826.9031 Q1812.3438,826.325 1811.75,826.0594 Q1811.1563,825.7781 1810.5313,825.7781 Q1809.1875,825.7781 1808.5,826.8563 Q1807.8125,827.9188 1807.8125,830.0125 Q1807.8125,832.1063 1808.5,833.1844 Q1809.1875,834.2469 1810.5313,834.2469 Q1811.1563,834.2469 1811.75,833.9813 Q1812.3438,833.7 1812.9688,833.1219 L1812.9688,835.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1824" y="834.3543">type_list</text>
@@ -89,8 +89,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="846.2" y2="846.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="854.2" y2="854.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
       <ellipse cx="980.5" cy="981.7" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M983.4688,987.3406 Q982.8906,987.6375 982.25,987.7781 Q981.6094,987.9344 980.9063,987.9344 Q978.4063,987.9344 977.0781,986.2938 Q975.7656,984.6375 975.7656,981.5125 Q975.7656,978.3875 977.0781,976.7313 Q978.4063,975.075 980.9063,975.075 Q981.6094,975.075 982.25,975.2313 Q982.9063,975.3875 983.4688,975.6844 L983.4688,978.4031 Q982.8438,977.825 982.25,977.5594 Q981.6563,977.2781 981.0313,977.2781 Q979.6875,977.2781 979,978.3563 Q978.3125,979.4188 978.3125,981.5125 Q978.3125,983.6063 979,984.6844 Q979.6875,985.7469 981.0313,985.7469 Q981.6563,985.7469 982.25,985.4813 Q982.8438,985.2 983.4688,984.6219 L983.4688,987.3406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="994.5" y="985.8543">type_group_pair</text>
@@ -99,15 +99,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="997.7" y2="997.7"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="1005.7" y2="1005.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="971.5" y="1011.7"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="973.5" y="1013.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="101" x="985.5" y="1019.9104">size : const size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
       <ellipse cx="2232" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2234.9688,1084.8406 Q2234.3906,1085.1375 2233.75,1085.2781 Q2233.1094,1085.4344 2232.4063,1085.4344 Q2229.9063,1085.4344 2228.5781,1083.7938 Q2227.2656,1082.1375 2227.2656,1079.0125 Q2227.2656,1075.8875 2228.5781,1074.2313 Q2229.9063,1072.575 2232.4063,1072.575 Q2233.1094,1072.575 2233.75,1072.7313 Q2234.4063,1072.8875 2234.9688,1073.1844 L2234.9688,1075.9031 Q2234.3438,1075.325 2233.75,1075.0594 Q2233.1563,1074.7781 2232.5313,1074.7781 Q2231.1875,1074.7781 2230.5,1075.8563 Q2229.8125,1076.9188 2229.8125,1079.0125 Q2229.8125,1081.1063 2230.5,1082.1844 Q2231.1875,1083.2469 2232.5313,1083.2469 Q2233.1563,1083.2469 2233.75,1082.9813 Q2234.3438,1082.7 2234.9688,1082.1219 L2234.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="2246" y="1083.3543">optional_ref</text>
@@ -116,8 +116,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
       <ellipse cx="1595" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1597.9688,1084.8406 Q1597.3906,1085.1375 1596.75,1085.2781 Q1596.1094,1085.4344 1595.4063,1085.4344 Q1592.9063,1085.4344 1591.5781,1083.7938 Q1590.2656,1082.1375 1590.2656,1079.0125 Q1590.2656,1075.8875 1591.5781,1074.2313 Q1592.9063,1072.575 1595.4063,1072.575 Q1596.1094,1072.575 1596.75,1072.7313 Q1597.4063,1072.8875 1597.9688,1073.1844 L1597.9688,1075.9031 Q1597.3438,1075.325 1596.75,1075.0594 Q1596.1563,1074.7781 1595.5313,1074.7781 Q1594.1875,1074.7781 1593.5,1075.8563 Q1592.8125,1076.9188 1592.8125,1079.0125 Q1592.8125,1081.1063 1593.5,1082.1844 Q1594.1875,1083.2469 1595.5313,1083.2469 Q1596.1563,1083.2469 1596.75,1082.9813 Q1597.3438,1082.7 1597.9688,1082.1219 L1597.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="1609" y="1083.3543">optional_ref</text>
@@ -126,8 +126,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
       <ellipse cx="967" cy="832.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M969.9688,837.8406 Q969.3906,838.1375 968.75,838.2781 Q968.1094,838.4344 967.4063,838.4344 Q964.9063,838.4344 963.5781,836.7938 Q962.2656,835.1375 962.2656,832.0125 Q962.2656,828.8875 963.5781,827.2313 Q964.9063,825.575 967.4063,825.575 Q968.1094,825.575 968.75,825.7313 Q969.4063,825.8875 969.9688,826.1844 L969.9688,828.9031 Q969.3438,828.325 968.75,828.0594 Q968.1563,827.7781 967.5313,827.7781 Q966.1875,827.7781 965.5,828.8563 Q964.8125,829.9188 964.8125,832.0125 Q964.8125,834.1063 965.5,835.1844 Q966.1875,836.2469 967.5313,836.2469 Q968.1563,836.2469 968.75,835.9813 Q969.3438,835.7 969.9688,835.1219 L969.9688,837.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="981" y="836.3543">type_group_pair_it</text>
@@ -135,54 +135,54 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="256" x="1104" y="825.3387">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="848.2" y2="848.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="854.2"/>
       <ellipse cx="963" cy="859.2" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="290" x="972" y="862.4104">find(const value_type &amp; v) constexpr : unsigned int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="867.0047"/>
       <ellipse cx="963" cy="872.0047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="972" y="875.2151">get(unsigned int i) : ref_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="879.8094"/>
       <ellipse cx="963" cy="884.8094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="227" x="972" y="888.0198">getp(unsigned int i) : const value_type *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="894.6141" y2="894.6141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
       <ellipse cx="1863" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,349.8406 Q1865.3906,350.1375 1864.75,350.2781 Q1864.1094,350.4344 1863.4063,350.4344 Q1860.9063,350.4344 1859.5781,348.7938 Q1858.2656,347.1375 1858.2656,344.0125 Q1858.2656,340.8875 1859.5781,339.2313 Q1860.9063,337.575 1863.4063,337.575 Q1864.1094,337.575 1864.75,337.7313 Q1865.4063,337.8875 1865.9688,338.1844 L1865.9688,340.9031 Q1865.3438,340.325 1864.75,340.0594 Q1864.1563,339.7781 1863.5313,339.7781 Q1862.1875,339.7781 1861.5,340.8563 Q1860.8125,341.9188 1860.8125,344.0125 Q1860.8125,346.1063 1861.5,347.1844 Q1862.1875,348.2469 1863.5313,348.2469 Q1864.1563,348.2469 1864.75,347.9813 Q1865.3438,347.7 1865.9688,347.1219 L1865.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="348.3543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
       <ellipse cx="1863" cy="664.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,669.8406 Q1865.3906,670.1375 1864.75,670.2781 Q1864.1094,670.4344 1863.4063,670.4344 Q1860.9063,670.4344 1859.5781,668.7938 Q1858.2656,667.1375 1858.2656,664.0125 Q1858.2656,660.8875 1859.5781,659.2313 Q1860.9063,657.575 1863.4063,657.575 Q1864.1094,657.575 1864.75,657.7313 Q1865.4063,657.8875 1865.9688,658.1844 L1865.9688,660.9031 Q1865.3438,660.325 1864.75,660.0594 Q1864.1563,659.7781 1863.5313,659.7781 Q1862.1875,659.7781 1861.5,660.8563 Q1860.8125,661.9188 1860.8125,664.0125 Q1860.8125,666.1063 1861.5,667.1844 Q1862.1875,668.2469 1863.5313,668.2469 Q1864.1563,668.2469 1864.75,667.9813 Q1865.3438,667.7 1865.9688,667.1219 L1865.9688,669.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="668.3543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="680.2" y2="680.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="688.2" y2="688.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
       <ellipse cx="1863" cy="427.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,432.8406 Q1865.3906,433.1375 1864.75,433.2781 Q1864.1094,433.4344 1863.4063,433.4344 Q1860.9063,433.4344 1859.5781,431.7938 Q1858.2656,430.1375 1858.2656,427.0125 Q1858.2656,423.8875 1859.5781,422.2313 Q1860.9063,420.575 1863.4063,420.575 Q1864.1094,420.575 1864.75,420.7313 Q1865.4063,420.8875 1865.9688,421.1844 L1865.9688,423.9031 Q1865.3438,423.325 1864.75,423.0594 Q1864.1563,422.7781 1863.5313,422.7781 Q1862.1875,422.7781 1861.5,423.8563 Q1860.8125,424.9188 1860.8125,427.0125 Q1860.8125,429.1063 1861.5,430.1844 Q1862.1875,431.2469 1863.5313,431.2469 Q1864.1563,431.2469 1864.75,430.9813 Q1865.3438,430.7 1865.9688,430.1219 L1865.9688,432.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="431.3543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="443.2" y2="443.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="451.2" y2="451.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
       <ellipse cx="1097" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1099.9688,349.8406 Q1099.3906,350.1375 1098.75,350.2781 Q1098.1094,350.4344 1097.4063,350.4344 Q1094.9063,350.4344 1093.5781,348.7938 Q1092.2656,347.1375 1092.2656,344.0125 Q1092.2656,340.8875 1093.5781,339.2313 Q1094.9063,337.575 1097.4063,337.575 Q1098.1094,337.575 1098.75,337.7313 Q1099.4063,337.8875 1099.9688,338.1844 L1099.9688,340.9031 Q1099.3438,340.325 1098.75,340.0594 Q1098.1563,339.7781 1097.5313,339.7781 Q1096.1875,339.7781 1095.5,340.8563 Q1094.8125,341.9188 1094.8125,344.0125 Q1094.8125,346.1063 1095.5,347.1844 Q1096.1875,348.2469 1097.5313,348.2469 Q1098.1563,348.2469 1098.75,347.9813 Q1099.3438,347.7 1099.9688,347.1219 L1099.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1111" y="348.3543">type_list</text>
@@ -191,8 +191,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
       <ellipse cx="1403" cy="1224.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1405.9688,1229.8406 Q1405.3906,1230.1375 1404.75,1230.2781 Q1404.1094,1230.4344 1403.4063,1230.4344 Q1400.9063,1230.4344 1399.5781,1228.7938 Q1398.2656,1227.1375 1398.2656,1224.0125 Q1398.2656,1220.8875 1399.5781,1219.2313 Q1400.9063,1217.575 1403.4063,1217.575 Q1404.1094,1217.575 1404.75,1217.7313 Q1405.4063,1217.8875 1405.9688,1218.1844 L1405.9688,1220.9031 Q1405.3438,1220.325 1404.75,1220.0594 Q1404.1563,1219.7781 1403.5313,1219.7781 Q1402.1875,1219.7781 1401.5,1220.8563 Q1400.8125,1221.9188 1400.8125,1224.0125 Q1400.8125,1226.1063 1401.5,1227.1844 Q1402.1875,1228.2469 1403.5313,1228.2469 Q1404.1563,1228.2469 1404.75,1227.9813 Q1405.3438,1227.7 1405.9688,1227.1219 L1405.9688,1229.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1417" y="1228.3543">type_list</text>
@@ -201,8 +201,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1240.2" y2="1240.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1248.2" y2="1248.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
       <ellipse cx="1110.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1113.4688,592.8406 Q1112.8906,593.1375 1112.25,593.2781 Q1111.6094,593.4344 1110.9063,593.4344 Q1108.4063,593.4344 1107.0781,591.7938 Q1105.7656,590.1375 1105.7656,587.0125 Q1105.7656,583.8875 1107.0781,582.2313 Q1108.4063,580.575 1110.9063,580.575 Q1111.6094,580.575 1112.25,580.7313 Q1112.9063,580.8875 1113.4688,581.1844 L1113.4688,583.9031 Q1112.8438,583.325 1112.25,583.0594 Q1111.6563,582.7781 1111.0313,582.7781 Q1109.6875,582.7781 1109,583.8563 Q1108.3125,584.9188 1108.3125,587.0125 Q1108.3125,589.1063 1109,590.1844 Q1109.6875,591.2469 1111.0313,591.2469 Q1111.6563,591.2469 1112.25,590.9813 Q1112.8438,590.7 1113.4688,590.1219 L1113.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1124.5" y="591.3543">type_list</text>
@@ -211,8 +211,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
       <ellipse cx="517" cy="764.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.9688,769.8406 Q519.3906,770.1375 518.75,770.2781 Q518.1094,770.4344 517.4063,770.4344 Q514.9063,770.4344 513.5781,768.7938 Q512.2656,767.1375 512.2656,764.0125 Q512.2656,760.8875 513.5781,759.2313 Q514.9063,757.575 517.4063,757.575 Q518.1094,757.575 518.75,757.7313 Q519.4063,757.8875 519.9688,758.1844 L519.9688,760.9031 Q519.3438,760.325 518.75,760.0594 Q518.1563,759.7781 517.5313,759.7781 Q516.1875,759.7781 515.5,760.8563 Q514.8125,761.9188 514.8125,764.0125 Q514.8125,766.1063 515.5,767.1844 Q516.1875,768.2469 517.5313,768.2469 Q518.1563,768.2469 518.75,767.9813 Q519.3438,767.7 519.9688,767.1219 L519.9688,769.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="531" y="768.3543">type_group_pair</text>
@@ -221,30 +221,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="780.2" y2="780.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="788.2" y2="788.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
       <ellipse cx="197.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,607.8406 Q199.6406,608.1375 199,608.2781 Q198.3594,608.4344 197.6563,608.4344 Q195.1563,608.4344 193.8281,606.7938 Q192.5156,605.1375 192.5156,602.0125 Q192.5156,598.8875 193.8281,597.2313 Q195.1563,595.575 197.6563,595.575 Q198.3594,595.575 199,595.7313 Q199.6563,595.8875 200.2188,596.1844 L200.2188,598.9031 Q199.5938,598.325 199,598.0594 Q198.4063,597.7781 197.7813,597.7781 Q196.4375,597.7781 195.75,598.8563 Q195.0625,599.9188 195.0625,602.0125 Q195.0625,604.1063 195.75,605.1844 Q196.4375,606.2469 197.7813,606.2469 Q198.4063,606.2469 199,605.9813 Q199.5938,605.7 200.2188,605.1219 L200.2188,607.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.75" y="606.3543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="618.2" y2="618.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="626.2" y2="626.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.2"/>
       <ellipse cx="17" cy="637.2" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="373" x="26" y="640.4104">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.0047"/>
       <ellipse cx="17" cy="650.0047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="175" x="26" y="653.2151">aboolint : type_list&lt;A,bool,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
       <ellipse cx="1750" cy="1162.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1752.9688,1167.8406 Q1752.3906,1168.1375 1751.75,1168.2781 Q1751.1094,1168.4344 1750.4063,1168.4344 Q1747.9063,1168.4344 1746.5781,1166.7938 Q1745.2656,1165.1375 1745.2656,1162.0125 Q1745.2656,1158.8875 1746.5781,1157.2313 Q1747.9063,1155.575 1750.4063,1155.575 Q1751.1094,1155.575 1751.75,1155.7313 Q1752.4063,1155.8875 1752.9688,1156.1844 L1752.9688,1158.9031 Q1752.3438,1158.325 1751.75,1158.0594 Q1751.1563,1157.7781 1750.5313,1157.7781 Q1749.1875,1157.7781 1748.5,1158.8563 Q1747.8125,1159.9188 1747.8125,1162.0125 Q1747.8125,1164.1063 1748.5,1165.1844 Q1749.1875,1166.2469 1750.5313,1166.2469 Q1751.1563,1166.2469 1751.75,1165.9813 Q1752.3438,1165.7 1752.9688,1165.1219 L1752.9688,1167.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="1764" y="1166.3543">type_group_pair</text>
@@ -253,8 +253,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1178.2" y2="1178.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1186.2" y2="1186.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
       <ellipse cx="1709.5" cy="747.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1712.4688,752.8406 Q1711.8906,753.1375 1711.25,753.2781 Q1710.6094,753.4344 1709.9063,753.4344 Q1707.4063,753.4344 1706.0781,751.7938 Q1704.7656,750.1375 1704.7656,747.0125 Q1704.7656,743.8875 1706.0781,742.2313 Q1707.4063,740.575 1709.9063,740.575 Q1710.6094,740.575 1711.25,740.7313 Q1711.9063,740.8875 1712.4688,741.1844 L1712.4688,743.9031 Q1711.8438,743.325 1711.25,743.0594 Q1710.6563,742.7781 1710.0313,742.7781 Q1708.6875,742.7781 1708,743.8563 Q1707.3125,744.9188 1707.3125,747.0125 Q1707.3125,749.1063 1708,750.1844 Q1708.6875,751.2469 1710.0313,751.2469 Q1710.6563,751.2469 1711.25,750.9813 Q1711.8438,750.7 1712.4688,750.1219 L1712.4688,752.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="1723.5" y="751.3543">type_group_pair_it</text>
@@ -263,8 +263,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="763.2" y2="763.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="771.2" y2="771.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o6g1a8jahzkd)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr8cl3cixx0wh)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
       <ellipse cx="1817.5" cy="24.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1820.4688,29.8406 Q1819.8906,30.1375 1819.25,30.2781 Q1818.6094,30.4344 1817.9063,30.4344 Q1815.4063,30.4344 1814.0781,28.7938 Q1812.7656,27.1375 1812.7656,24.0125 Q1812.7656,20.8875 1814.0781,19.2313 Q1815.4063,17.575 1817.9063,17.575 Q1818.6094,17.575 1819.25,17.7313 Q1819.9063,17.8875 1820.4688,18.1844 L1820.4688,20.9031 Q1819.8438,20.325 1819.25,20.0594 Q1818.6563,19.7781 1818.0313,19.7781 Q1816.6875,19.7781 1816,20.8563 Q1815.3125,21.9188 1815.3125,24.0125 Q1815.3125,26.1063 1816,27.1844 Q1816.6875,28.2469 1818.0313,28.2469 Q1818.6563,28.2469 1819.25,27.9813 Q1819.8438,27.7 1820.4688,27.1219 L1820.4688,29.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1831.5" y="28.3543">head</text>
diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg
index 298d8a14..65fe6b68 100644
--- a/docs/test_cases/t00064_class_mermaid.svg
+++ b/docs/test_cases/t00064_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 3853.625 647" style="max-width: 3853.62px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 3853.625 647" style="max-width: 3853.62px; background-color: white;" width="3853.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -80,236 +80,288 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M3450.218657544379,109L3432.8671104536493,114.66666666666667C3415.5155633629197,120.33333333333333,3380.8124691814596,131.66666666666666,3363.4609220907296,143C3346.109375,154.33333333333334,3346.109375,165.66666666666666,3346.109375,171.33333333333334L3346.109375,177"/>
       </g>
       <g class="edgeLabels">
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
@@ -338,7 +390,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8">
+        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0002055044356505752139-0" class="node default clickable">
             <rect height="57" width="129.421875" y="-28.5" x="-64.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="64.7109375" x1="-64.7109375" class="divider"/>
@@ -357,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L11">
+        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L11">
           <g title="type_list" id="classId-C_0001536403088019105838-1" class="node default clickable">
             <rect height="57" width="225.421875" y="-28.5" x="-112.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.7109375" x1="-112.7109375" class="divider"/>
@@ -376,7 +428,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L13">
+        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L13">
           <g title="type_list" id="classId-C_0001613293628874851145-2" class="node default clickable">
             <rect height="57" width="190.765625" y="-28.5" x="-95.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.3828125" x1="-95.3828125" class="divider"/>
@@ -395,7 +447,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15">
+        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15">
           <g title="type_list" id="classId-C_0000096201031647373215-3" class="node default clickable">
             <rect height="57" width="181.890625" y="-28.5" x="-90.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="90.9453125" x1="-90.9453125" class="divider"/>
@@ -414,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L17">
+        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L17">
           <g title="head" id="classId-C_0001342666740698875376-4" class="node default clickable">
             <rect height="57" width="237.921875" y="-28.5" x="-118.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="118.9609375" x1="-118.9609375" class="divider"/>
@@ -433,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8">
+        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000074655005329778311-5" class="node default clickable">
             <rect height="57" width="148.09375" y="-28.5" x="-74.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.046875" x1="-74.046875" class="divider"/>
@@ -452,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001877705309010128195-6" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -471,7 +523,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001737554639587928188-7" class="node default clickable">
             <rect height="57" width="169.734375" y="-28.5" x="-84.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="84.8671875" x1="-84.8671875" class="divider"/>
@@ -490,7 +542,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L27">
+        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L27">
           <g title="type_group_pair" id="classId-C_0001313421318785708660-8" class="node default clickable">
             <rect height="79" width="449.828125" y="-39.5" x="-224.9140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="224.9140625" x1="-224.9140625" class="divider"/>
@@ -514,7 +566,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0002110316024454672764-9" class="node default clickable">
             <rect height="57" width="135.03125" y="-28.5" x="-67.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.515625" x1="-67.515625" class="divider"/>
@@ -533,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0000476531044436856932-10" class="node default clickable">
             <rect height="57" width="686.34375" y="-28.5" x="-343.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="343.171875" x1="-343.171875" class="divider"/>
@@ -552,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L35">
+        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L35">
           <g title="type_group_pair_it" id="classId-C_0001024383802991748694-11" class="node default clickable">
             <rect height="123" width="482.71875" y="-61.5" x="-241.359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="241.359375" x1="-241.359375" class="divider"/>
@@ -568,9 +620,9 @@
                   <span class="nodeLabel">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, -8)" height="18" width="293.0625">
+              <foreignObject transform="translate( -233.859375, -8)" height="18" width="375.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+find(const value_type &amp; v) : unsigned int</span>
+                  <span class="nodeLabel">+find(const value_type &amp; v) : [constexpr] unsigned int</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -233.859375, 14)" height="18" width="181.890625">
@@ -586,7 +638,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L51">
+        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L51">
           <g title="A" id="classId-C_0000586286676481245707-12" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -605,7 +657,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L52">
+        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L52">
           <g title="B" id="classId-C_0001353306307770366167-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -624,7 +676,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L53">
+        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L53">
           <g title="C" id="classId-C_0000598044391549147725-14" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -643,7 +695,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L8">
+        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000425551452299939770-15" class="node default clickable">
             <rect height="57" width="172.359375" y="-28.5" x="-86.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="86.1796875" x1="-86.1796875" class="divider"/>
@@ -662,7 +714,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0000179850898515269194-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -681,7 +733,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001070380438303872295-17" class="node default clickable">
             <rect height="57" width="142.15625" y="-28.5" x="-71.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="71.078125" x1="-71.078125" class="divider"/>
@@ -700,7 +752,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0001854055939974723413-18" class="node default clickable">
             <rect height="57" width="464.90625" y="-28.5" x="-232.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="232.453125" x1="-232.453125" class="divider"/>
@@ -719,7 +771,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L55">
+        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L55">
           <g title="R" id="classId-C_0002161425587790795236-19" class="node default clickable">
             <rect height="101" width="481.546875" y="-50.5" x="-240.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="240.7734375" x1="-240.7734375" class="divider"/>
@@ -748,7 +800,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L25">
+        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0000271990753639572557-20" class="node default clickable">
             <rect height="57" width="312.890625" y="-28.5" x="-156.4453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="156.4453125" x1="-156.4453125" class="divider"/>
@@ -767,7 +819,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L33">
+        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L33">
           <g title="type_group_pair_it" id="classId-C_0001057906395469156958-21" class="node default clickable">
             <rect height="57" width="410.703125" y="-28.5" x="-205.3515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="205.3515625" x1="-205.3515625" class="divider"/>
@@ -786,7 +838,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00064/t00064.cc#L15">
+        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00064/t00064.cc#L15">
           <g title="head" id="classId-C_0001317314479884183399-22" class="node default clickable">
             <rect height="57" width="145.734375" y="-28.5" x="-72.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.8671875" x1="-72.8671875" class="divider"/>
diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md
index 436d083e..ab3dc08b 100644
--- a/docs/test_cases/t00065.md
+++ b/docs/test_cases/t00065.md
@@ -529,7 +529,7 @@ struct R {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg
index f67bdc18..52bbbb45 100644
--- a/docs/test_cases/t00065_class.svg
+++ b/docs/test_cases/t00065_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="792px" preserveAspectRatio="none" style="width:746px;height:792px;" version="1.1" viewBox="0 0 746 792" width="746px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2rray2tizotn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fjecvalro6c1" 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"/>
@@ -9,20 +9,20 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f2rray2tizotn)" points="22,157,96,157,103,179.2969,347,179.2969,347,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fjecvalro6c1)" points="22,157,96,157,103,179.2969,347,179.2969,347,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="103" y1="179.2969" y2="179.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="26" y="171.9951">module1</text>
-    <polygon fill="#FFFFFF" filter="url(#f2rray2tizotn)" points="201,341,313,341,320,363.2969,323,363.2969,323,440,201,440,201,341" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fjecvalro6c1)" points="201,341,313,341,320,363.2969,323,363.2969,323,440,201,440,201,341" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="201" x2="320" y1="363.2969" y2="363.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="205" y="355.9951">submodule1a</text>
-    <polygon fill="#FFFFFF" filter="url(#f2rray2tizotn)" points="371,176,445,176,452,198.2969,724,198.2969,724,780,371,780,371,176" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fjecvalro6c1)" points="371,176,445,176,452,198.2969,724,198.2969,724,780,371,780,371,176" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="371" x2="452" y1="198.2969" y2="198.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="375" y="190.9951">module2</text>
-    <polygon fill="#FFFFFF" filter="url(#f2rray2tizotn)" points="476,513,555,513,562,535.2969,600,535.2969,600,656,476,656,476,513" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fjecvalro6c1)" points="476,513,555,513,562,535.2969,600,535.2969,600,656,476,656,476,513" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="476" x2="562" y1="535.2969" y2="535.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="480" y="527.9951">concepts</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
       <ellipse cx="144" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.1094,379 L140.3906,379 L140.3906,366.6094 L148.1094,366.6094 L148.1094,368.7656 L142.8438,368.7656 L142.8438,371.4375 L147.6094,371.4375 L147.6094,373.5938 L142.8438,373.5938 L142.8438,376.8438 L148.1094,376.8438 L148.1094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="158" y="377.1543">ABC</text>
@@ -32,8 +32,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="135" y="428.8198">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
       <ellipse cx="53.5" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M57.6094,379 L49.8906,379 L49.8906,366.6094 L57.6094,366.6094 L57.6094,368.7656 L52.3438,368.7656 L52.3438,371.4375 L57.1094,371.4375 L57.1094,373.5938 L52.3438,373.5938 L52.3438,376.8438 L57.6094,376.8438 L57.6094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="67.5" y="377.1543">XYZ</text>
@@ -43,68 +43,68 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="5" x="44.5" y="428.8198">z</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="130.5" y="192"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="130.5" y="192"/>
       <ellipse cx="196.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.7188,213.6406 Q199.1406,213.9375 198.5,214.0781 Q197.8594,214.2344 197.1563,214.2344 Q194.6563,214.2344 193.3281,212.5938 Q192.0156,210.9375 192.0156,207.8125 Q192.0156,204.6875 193.3281,203.0313 Q194.6563,201.375 197.1563,201.375 Q197.8594,201.375 198.5,201.5313 Q199.1563,201.6875 199.7188,201.9844 L199.7188,204.7031 Q199.0938,204.125 198.5,203.8594 Q197.9063,203.5781 197.2813,203.5781 Q195.9375,203.5781 195.25,204.6563 Q194.5625,205.7188 194.5625,207.8125 Q194.5625,209.9063 195.25,210.9844 Q195.9375,212.0469 197.2813,212.0469 Q197.9063,212.0469 198.5,211.7813 Q199.0938,211.5 199.7188,210.9219 L199.7188,213.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.25" y="212.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="224" y2="224"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="232" y2="232"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="238"/>
       <ellipse cx="141.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="150.5" y="246.2104">abc : ABC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="250.8047"/>
       <ellipse cx="141.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="150.5" y="259.0151">pimpl : detail::AImpl *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="263.6094"/>
       <ellipse cx="141.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="150.5" y="271.8198">xyz : XYZ</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="220.5" y="376"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="220.5" y="376"/>
       <ellipse cx="235.5" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M238.4688,397.6406 Q237.8906,397.9375 237.25,398.0781 Q236.6094,398.2344 235.9063,398.2344 Q233.4063,398.2344 232.0781,396.5938 Q230.7656,394.9375 230.7656,391.8125 Q230.7656,388.6875 232.0781,387.0313 Q233.4063,385.375 235.9063,385.375 Q236.6094,385.375 237.25,385.5313 Q237.9063,385.6875 238.4688,385.9844 L238.4688,388.7031 Q237.8438,388.125 237.25,387.8594 Q236.6563,387.5781 236.0313,387.5781 Q234.6875,387.5781 234,388.6563 Q233.3125,389.7188 233.3125,391.8125 Q233.3125,393.9063 234,394.9844 Q234.6875,396.0469 236.0313,396.0469 Q236.6563,396.0469 237.25,395.7813 Q237.8438,395.5 238.4688,394.9219 L238.4688,397.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="396.1543">AImpl</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="408" y2="408"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="416" y2="416"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="424.5" y="359"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="424.5" y="359"/>
       <ellipse cx="482.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M485.7188,380.6406 Q485.1406,380.9375 484.5,381.0781 Q483.8594,381.2344 483.1563,381.2344 Q480.6563,381.2344 479.3281,379.5938 Q478.0156,377.9375 478.0156,374.8125 Q478.0156,371.6875 479.3281,370.0313 Q480.6563,368.375 483.1563,368.375 Q483.8594,368.375 484.5,368.5313 Q485.1563,368.6875 485.7188,368.9844 L485.7188,371.7031 Q485.0938,371.125 484.5,370.8594 Q483.9063,370.5781 483.2813,370.5781 Q481.9375,370.5781 481.25,371.6563 Q480.5625,372.7188 480.5625,374.8125 Q480.5625,376.9063 481.25,377.9844 Q481.9375,379.0469 483.2813,379.0469 Q483.9063,379.0469 484.5,378.7813 Q485.0938,378.5 485.7188,377.9219 L485.7188,380.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="503.25" y="379.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="391" y2="391"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="430.5" y="397"/>
       <ellipse cx="435.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="444.5" y="405.2104">B() = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="425.5" x2="556.5" y1="411.8047" y2="411.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="430.5" y="417.8047"/>
       <ellipse cx="435.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="444.5" y="426.0151">b() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="432.6094" y2="432.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="503.5" y="703"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="503.5" y="703"/>
       <ellipse cx="522.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M525.0688,724.6406 Q524.4906,724.9375 523.85,725.0781 Q523.2094,725.2344 522.5063,725.2344 Q520.0063,725.2344 518.6781,723.5938 Q517.3656,721.9375 517.3656,718.8125 Q517.3656,715.6875 518.6781,714.0313 Q520.0063,712.375 522.5063,712.375 Q523.2094,712.375 523.85,712.5313 Q524.5063,712.6875 525.0688,712.9844 L525.0688,715.7031 Q524.4438,715.125 523.85,714.8594 Q523.2563,714.5781 522.6313,714.5781 Q521.2875,714.5781 520.6,715.6563 Q519.9125,716.7188 519.9125,718.8125 Q519.9125,720.9063 520.6,721.9844 Q521.2875,723.0469 522.6313,723.0469 Q523.2563,723.0469 523.85,722.7813 Q524.4438,722.5 525.0688,721.9219 L525.0688,724.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="536.9" y="723.1543">C</text>
@@ -113,15 +113,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="735" y2="735"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="743" y2="743"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="509.5" y="749"/>
       <ellipse cx="514.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="523.5" y="757.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="620" y="570"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="620" y="570"/>
       <ellipse cx="635" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M637.9688,591.6406 Q637.3906,591.9375 636.75,592.0781 Q636.1094,592.2344 635.4063,592.2344 Q632.9063,592.2344 631.5781,590.5938 Q630.2656,588.9375 630.2656,585.8125 Q630.2656,582.6875 631.5781,581.0313 Q632.9063,579.375 635.4063,579.375 Q636.1094,579.375 636.75,579.5313 Q637.4063,579.6875 637.9688,579.9844 L637.9688,582.7031 Q637.3438,582.125 636.75,581.8594 Q636.1563,581.5781 635.5313,581.5781 Q634.1875,581.5781 633.5,582.6563 Q632.8125,583.7188 632.8125,585.8125 Q632.8125,587.9063 633.5,588.9844 Q634.1875,590.0469 635.5313,590.0469 Q636.1563,590.0469 636.75,589.7813 Q637.3438,589.5 637.9688,588.9219 L637.9688,591.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="649" y="590.1543">C</text>
@@ -130,8 +130,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="602" y2="602"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="610" y2="610"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="592.5" y="363"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="592.5" y="363"/>
       <ellipse cx="607.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M610.4688,384.6406 Q609.8906,384.9375 609.25,385.0781 Q608.6094,385.2344 607.9063,385.2344 Q605.4063,385.2344 604.0781,383.5938 Q602.7656,381.9375 602.7656,378.8125 Q602.7656,375.6875 604.0781,374.0313 Q605.4063,372.375 607.9063,372.375 Q608.6094,372.375 609.25,372.5313 Q609.9063,372.6875 610.4688,372.9844 L610.4688,375.7031 Q609.8438,375.125 609.25,374.8594 Q608.6563,374.5781 608.0313,374.5781 Q606.6875,374.5781 606,375.6563 Q605.3125,376.7188 605.3125,378.8125 Q605.3125,380.9063 606,381.9844 Q606.6875,383.0469 608.0313,383.0469 Q608.6563,383.0469 609.25,382.7813 Q609.8438,382.5 610.4688,381.9219 L610.4688,384.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="621.5" y="383.1543">D</text>
@@ -140,22 +140,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="395" y2="395"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="403" y2="403"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="409"/>
       <ellipse cx="603.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="612.5" y="417.2104">c : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="421.8047"/>
       <ellipse cx="603.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="612.5" y="430.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="387" y="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="387" y="211"/>
       <ellipse cx="402" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M404.9688,232.6406 Q404.3906,232.9375 403.75,233.0781 Q403.1094,233.2344 402.4063,233.2344 Q399.9063,233.2344 398.5781,231.5938 Q397.2656,229.9375 397.2656,226.8125 Q397.2656,223.6875 398.5781,222.0313 Q399.9063,220.375 402.4063,220.375 Q403.1094,220.375 403.75,220.5313 Q404.4063,220.6875 404.9688,220.9844 L404.9688,223.7031 Q404.3438,223.125 403.75,222.8594 Q403.1563,222.5781 402.5313,222.5781 Q401.1875,222.5781 400.5,223.6563 Q399.8125,224.7188 399.8125,226.8125 Q399.8125,228.9063 400.5,229.9844 Q401.1875,231.0469 402.5313,231.0469 Q403.1563,231.0469 403.75,230.7813 Q404.3438,230.5 404.9688,229.9219 L404.9688,232.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="416" y="231.1543">C</text>
@@ -164,8 +164,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="243" y2="243"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="474.5" y="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="474.5" y="211"/>
       <ellipse cx="489.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M492.4688,232.6406 Q491.8906,232.9375 491.25,233.0781 Q490.6094,233.2344 489.9063,233.2344 Q487.4063,233.2344 486.0781,231.5938 Q484.7656,229.9375 484.7656,226.8125 Q484.7656,223.6875 486.0781,222.0313 Q487.4063,220.375 489.9063,220.375 Q490.6094,220.375 491.25,220.5313 Q491.9063,220.6875 492.4688,220.9844 L492.4688,223.7031 Q491.8438,223.125 491.25,222.8594 Q490.6563,222.5781 490.0313,222.5781 Q488.6875,222.5781 488,223.6563 Q487.3125,224.7188 487.3125,226.8125 Q487.3125,228.9063 488,229.9844 Q488.6875,231.0469 490.0313,231.0469 Q490.6563,231.0469 491.25,230.7813 Q491.8438,230.5 492.4688,229.9219 L492.4688,232.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="503.5" y="231.1543">D</text>
@@ -174,8 +174,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="243" y2="243"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="491.5" y="548"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="491.5" y="548"/>
       <ellipse cx="506.5" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M509.4688,572.6094 Q508.8906,572.9063 508.25,573.0469 Q507.6094,573.2031 506.9063,573.2031 Q504.4063,573.2031 503.0781,571.5625 Q501.7656,569.9063 501.7656,566.7813 Q501.7656,563.6563 503.0781,562 Q504.4063,560.3438 506.9063,560.3438 Q507.6094,560.3438 508.25,560.5 Q508.9063,560.6563 509.4688,560.9531 L509.4688,563.6719 Q508.8438,563.0938 508.25,562.8281 Q507.6563,562.5469 507.0313,562.5469 Q505.6875,562.5469 505,563.625 Q504.3125,564.6875 504.3125,566.7813 Q504.3125,568.875 505,569.9531 Q505.6875,571.0156 507.0313,571.0156 Q507.6563,571.0156 508.25,570.75 Q508.8438,570.4688 509.4688,569.8906 L509.4688,572.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="518.5" y="564.1387">«concept»</text>
@@ -186,33 +186,33 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="497.5" y="620.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="497.5" y="633.7573">t.b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2rray2tizotn)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="373.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fjecvalro6c1)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="373.5" y="8"/>
       <ellipse cx="406.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M409.0188,29.6406 Q408.4406,29.9375 407.8,30.0781 Q407.1594,30.2344 406.4563,30.2344 Q403.9563,30.2344 402.6281,28.5938 Q401.3156,26.9375 401.3156,23.8125 Q401.3156,20.6875 402.6281,19.0313 Q403.9563,17.375 406.4563,17.375 Q407.1594,17.375 407.8,17.5313 Q408.4563,17.6875 409.0188,17.9844 L409.0188,20.7031 Q408.3938,20.125 407.8,19.8594 Q407.2063,19.5781 406.5813,19.5781 Q405.2375,19.5781 404.55,20.6563 Q403.8625,21.7188 403.8625,23.8125 Q403.8625,25.9063 404.55,26.9844 Q405.2375,28.0469 406.5813,28.0469 Q407.2063,28.0469 407.8,27.7813 Q408.3938,27.5 409.0188,26.9219 L409.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="423.95" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="54"/>
       <ellipse cx="384.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="393.5" y="62.2104">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="66.8047"/>
       <ellipse cx="384.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="393.5" y="75.0151">c : C&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="79.6094"/>
       <ellipse cx="384.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="393.5" y="87.8198">d : D&lt;B&gt;</text>
     </a>
     <path d="M174.62,290.21 C172.09,296.1 169.81,302.1 168,308 C163.24,323.52 160.53,341.12 158.99,356.68 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg
index ab12010b..a2039cd3 100644
--- a/docs/test_cases/t00065_class_mermaid.svg
+++ b/docs/test_cases/t00065_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 916.65625 885" style="max-width: 916.656px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 974.5 885" style="max-width: 974.5px; background-color: white;" width="974.5" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,22 +50,22 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M161.296875,305.618482665466L146.04036458333334,314.0154022212217C130.78385416666666,322.4123217769773,100.27083333333333,339.2061608884887,85.01432291666667,353.26974711091106C69.7578125,367.3333333333333,69.7578125,378.6666666666667,69.7578125,384.3333333333333L69.7578125,390"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M243.2734375,322L243.2734375,327.6666666666667C243.2734375,333.3333333333333,243.2734375,344.6666666666667,243.2734375,356C243.2734375,367.3333333333333,243.2734375,378.6666666666667,243.2734375,384.3333333333333L243.2734375,390"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M325.25,307.1822649771732L339.5377604166667,315.3185541476443C353.8255208333333,323.4548433181155,382.4010416666667,339.7274216590577,396.6888020833333,360.8637108295288C410.9765625,382,410.9765625,408,410.9765625,421L410.9765625,434"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M876.2578125,704L876.2578125,715.5C876.2578125,727,876.2578125,750,860.8444010416666,769.7855177914511C845.4309895833334,789.571035582902,814.6041666666666,806.1420711658039,799.1907552083334,814.427588957255L783.77734375,822.713106748706"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M773.2956646126761,513L767.1747725938967,522.3333333333334C761.0538805751174,531.6666666666666,748.8120965375587,550.3333333333334,742.6912045187793,565.3333333333334C736.5703125,580.3333333333334,736.5703125,591.6666666666666,736.5703125,597.3333333333334L736.5703125,603"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M839.5324603873239,513L845.6533524061033,522.3333333333334C851.7742444248826,531.6666666666666,864.0160284624413,550.3333333333334,870.1369204812207,572.6666666666666C876.2578125,595,876.2578125,621,876.2578125,634L876.2578125,647"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M588.8766361256545,289L584.2474571880454,300.1666666666667C579.6182782504363,311.3333333333333,570.3599203752182,333.6666666666667,565.730741437609,354.1666666666667C561.1015625,374.6666666666667,561.1015625,393.3333333333333,561.1015625,402.6666666666667L561.1015625,412"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M612.5061763743455,289L617.1353553119546,300.1666666666667C621.7645342495637,311.3333333333333,631.0228921247818,333.6666666666667,635.652071062391,362.5833333333333C640.28125,391.5,640.28125,427,640.28125,462.5C640.28125,498,640.28125,533.5,640.28125,569C640.28125,604.5,640.28125,640,640.28125,674C640.28125,708,640.28125,740.5,655.0279947916666,764.9505270602499C669.7747395833334,789.4010541204998,699.2682291666666,805.8021082409996,714.0149739583334,814.0026353012495L728.76171875,822.2031623614994"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M768.015625,286.0882136144179L755.083984375,297.7401780120149C742.15234375,309.39214240961195,716.2890625,332.69607120480595,689.1666666666666,356.03428775451584C662.0442708333334,379.3725043042257,633.6627604166666,402.74500860845137,619.4720052083334,414.43126076056416L605.28125,426.11751291267706"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M799.3983556937172,289L800.567640161431,300.1666666666667C801.7369246291449,311.3333333333333,804.0754935645724,333.6666666666667,805.2447780322863,354.1666666666667C806.4140625,374.6666666666667,806.4140625,393.3333333333333,806.4140625,402.6666666666667L806.4140625,412"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M556.94140625,81.18974524311741L504.6634114583333,95.15812103593117C452.3854166666667,109.12649682874495,347.8294270833333,137.06324841437245,295.5514322916667,156.6982908738529C243.2734375,176.33333333333334,243.2734375,187.66666666666666,243.2734375,193.33333333333334L243.2734375,199"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M600.69140625,131L600.69140625,136.66666666666666C600.69140625,142.33333333333334,600.69140625,153.66666666666666,600.69140625,170.5C600.69140625,187.33333333333334,600.69140625,209.66666666666666,600.69140625,220.83333333333334L600.69140625,232"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M644.44140625,90.84717094102385L669.7701822916666,103.20597578418653C695.0989583333334,115.56478062734924,745.7565104166666,140.2823903136746,771.0852864583334,163.80786182350397C796.4140625,187.33333333333334,796.4140625,209.66666666666666,796.4140625,220.83333333333334L796.4140625,232"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M158.6484375,306.0823098617176L143.68619791666666,314.40192488476464C128.72395833333334,322.72153990781175,98.79947916666667,339.36076995390584,83.83723958333333,353.3470516436196C68.875,367.3333333333333,68.875,378.6666666666667,68.875,384.3333333333333L68.875,390"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M240.625,322L240.625,327.6666666666667C240.625,333.3333333333333,240.625,344.6666666666667,240.625,356C240.625,367.3333333333333,240.625,378.6666666666667,240.625,384.3333333333333L240.625,390"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M322.6015625,307.42930735728L336.7421875,315.5244227977333C350.8828125,323.61953823818664,379.1640625,339.80976911909335,393.3046875,360.90488455954664C407.4453125,382,407.4453125,408,407.4453125,421L407.4453125,434"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M934.1015625,704L934.1015625,715.5C934.1015625,727,934.1015625,750,918.6881510416666,769.7855177914511C903.2747395833334,789.571035582902,872.4479166666666,806.1420711658039,857.0345052083334,814.427588957255L841.62109375,822.713106748706"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M831.1394146126761,513L825.0185225938967,522.3333333333334C818.8976305751174,531.6666666666666,806.6558465375587,550.3333333333334,800.5349545187793,565.3333333333334C794.4140625,580.3333333333334,794.4140625,591.6666666666666,794.4140625,597.3333333333334L794.4140625,603"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M897.3762103873239,513L903.4971024061033,522.3333333333334C909.6179944248826,531.6666666666666,921.8597784624413,550.3333333333334,927.9806704812207,572.6666666666666C934.1015625,595,934.1015625,621,934.1015625,634L934.1015625,647"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M626.7976112565445,289L620.3743114637872,300.1666666666667C613.9510116710297,311.3333333333333,601.1044120855148,333.6666666666667,594.6811122927575,354.1666666666667C588.2578125,374.6666666666667,588.2578125,393.3333333333333,588.2578125,402.6666666666667L588.2578125,412"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.5852012434555,289L666.0085010362128,300.1666666666667C672.4318008289703,311.3333333333333,685.2784004144851,333.6666666666667,691.7017002072425,362.5833333333333C698.125,391.5,698.125,427,698.125,462.5C698.125,498,698.125,533.5,698.125,569C698.125,604.5,698.125,640,698.125,674C698.125,708,698.125,740.5,712.8717447916666,764.9505270602499C727.6184895833334,789.4010541204998,757.1119791666666,805.8021082409996,771.8587239583334,814.0026353012495L786.60546875,822.2031623614994"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M825.859375,286.0882136144179L812.927734375,297.7401780120149C799.99609375,309.39214240961195,774.1328125,332.69607120480595,747.0104166666666,353.79306526331646C719.8880208333334,374.89005932182704,691.5065104166666,393.7801186436541,677.3157552083334,403.22514830456754L663.125,412.67017796548106"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M857.2421056937172,289L858.411390161431,300.1666666666667C859.5806746291449,311.3333333333333,861.9192435645724,333.6666666666667,863.0885280322863,354.1666666666667C864.2578125,374.6666666666667,864.2578125,393.3333333333333,864.2578125,402.6666666666667L864.2578125,412"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M599.44140625,79.87872245456398L539.638671875,94.06560204546999C479.8359375,108.25248163637599,360.23046875,136.626240818188,300.427734375,156.47978707576067C240.625,176.33333333333334,240.625,187.66666666666666,240.625,193.33333333333334L240.625,199"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M643.19140625,131L643.19140625,136.66666666666666C643.19140625,142.33333333333334,643.19140625,153.66666666666666,643.19140625,170.5C643.19140625,187.33333333333334,643.19140625,209.66666666666666,643.19140625,220.83333333333334L643.19140625,232"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M686.94140625,89.29531027335148L714.8274739583334,101.91275856112622C742.7135416666666,114.53020684890099,798.4856770833334,139.76510342445047,826.3717447916666,163.5492183788919C854.2578125,187.33333333333334,854.2578125,209.66666666666666,854.2578125,220.83333333333334L854.2578125,232"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(69.7578125, 356)" class="edgeLabel">
+        <g transform="translate(68.875, 356)" class="edgeLabel">
           <g transform="translate(-17.5703125, -9)" class="label">
             <foreignObject height="18" width="35.140625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -76,7 +76,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(243.2734375, 356)" class="edgeLabel">
+        <g transform="translate(240.625, 356)" class="edgeLabel">
           <g transform="translate(-16.671875, -9)" class="label">
             <foreignObject height="18" width="33.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -87,7 +87,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(410.9765625, 356)" class="edgeLabel">
+        <g transform="translate(407.4453125, 356)" class="edgeLabel">
           <g transform="translate(-23.7890625, -9)" class="label">
             <foreignObject height="18" width="47.578125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -98,16 +98,18 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(736.5703125, 569)" class="edgeLabel">
+        <g transform="translate(794.4140625, 569)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -118,7 +120,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(876.2578125, 569)" class="edgeLabel">
+        <g transform="translate(934.1015625, 569)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -129,43 +131,51 @@
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g class="edgeLabel">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
           <g transform="translate(0, 0)" class="label">
             <foreignObject height="0" width="0">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                <span class="edgeLabel"/>
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
               </div>
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(243.2734375, 165)" class="edgeLabel">
+        <g transform="translate(240.625, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -176,7 +186,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(600.69140625, 165)" class="edgeLabel">
+        <g transform="translate(643.19140625, 165)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -187,7 +197,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(796.4140625, 165)" class="edgeLabel">
+        <g transform="translate(854.2578125, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -200,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(410.9765625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/submodule1a/submodule1a.h#L6">
+        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/submodule1a/submodule1a.h#L6">
           <g title="AImpl" id="classId-C_0000674757414308736755-0" class="node default clickable">
             <rect height="57" width="111.890625" y="-28.5" x="-55.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.9453125" x1="-55.9453125" class="divider"/>
@@ -219,15 +229,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.7578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L8">
+        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L8">
           <g title="ABC" id="classId-C_0002145362985538918973-1" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -17.3359375, -43)" height="18" width="34.671875" class="classTitle">
@@ -235,17 +245,17 @@
                   <span class="nodeLabel">ABC</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="8.90625">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="8.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">a</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="8.90625">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="8.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">b</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="8">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="8">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">c</span>
                 </div>
@@ -253,15 +263,15 @@
             </g>
           </g>
         </a>
-        <a transform="translate(243.2734375, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L10">
+        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L10">
           <g title="XYZ" id="classId-C_0001435940218810141944-2" class="node default clickable">
-            <rect height="145" width="123.515625" y="-72.5" x="-61.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
-            <line y2="61.5" y1="61.5" x2="61.7578125" x1="-61.7578125" class="divider"/>
+            <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
             <g class="label">
-              <foreignObject transform="translate( -54.2578125, -65)" height="18" width="108.515625">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">«Enumeration»</span>
+                  <span class="nodeLabel">«enumeration»</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -15.5625, -43)" height="18" width="31.125" class="classTitle">
@@ -269,17 +279,17 @@
                   <span class="nodeLabel">XYZ</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, -9)" height="18" width="8">
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="8">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">x</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 13)" height="18" width="8">
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="8">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">y</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.2578125, 35)" height="18" width="8">
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="8">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">z</span>
                 </div>
@@ -287,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(243.2734375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module1/module1.h#L12">
+        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module1/module1.h#L12">
           <g title="A" id="classId-C_0001178194542408300737-3" class="node default clickable">
             <rect height="123" width="163.953125" y="-61.5" x="-81.9765625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.9765625" x1="-81.9765625" class="divider"/>
@@ -321,7 +331,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(736.5703125, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/concepts/concepts.h#L7">
+        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/concepts/concepts.h#L7">
           <g title="bconcept" id="classId-C_0001325475407133721370-4" class="node default clickable">
             <rect height="145" width="114.578125" y="-72.5" x="-57.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
@@ -355,11 +365,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(561.1015625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L7">
+        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L7">
           <g title="B" id="classId-C_0001651810571114530033-5" class="node default clickable">
-            <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
+            <rect height="101" width="149.734375" y="-50.5" x="-74.8671875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -371,12 +381,12 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -36.6796875, 3)" height="18" width="73.359375">
+              <foreignObject transform="translate( -67.3671875, 3)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B() : void</span>
+                  <span class="nodeLabel">+B() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -36.6796875, 25)" height="18" width="71.59375">
+              <foreignObject transform="translate( -67.3671875, 25)" height="18" width="71.59375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+b() : void</span>
                 </div>
@@ -384,7 +394,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(756.26953125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001157378014768957235-6" class="node default clickable">
             <rect height="79" width="55.015625" y="-39.5" x="-27.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
@@ -408,7 +418,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(876.2578125, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0000580575003920044707-7" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -427,7 +437,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.4140625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0001719752929087851944-8" class="node default clickable">
             <rect height="101" width="130.578125" y="-50.5" x="-65.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.2890625" x1="-65.2890625" class="divider"/>
@@ -456,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.69140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001373403346245688670-9" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -475,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(796.4140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0002024276012622729482-10" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -494,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.69140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00065/t00065.cc#L6">
+        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00065/t00065.cc#L6">
           <g title="R" id="classId-C_0001082111961413727438-11" class="node default clickable">
             <rect height="123" width="87.5" y="-61.5" x="-43.75" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="43.75" x1="-43.75" class="divider"/>
diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md
index 7fdca228..08b3e952 100644
--- a/docs/test_cases/t00066.md
+++ b/docs/test_cases/t00066.md
@@ -804,7 +804,7 @@ int A::static_int = 1;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg
index 2cb5241a..d0986656 100644
--- a/docs/test_cases/t00066_class.svg
+++ b/docs/test_cases/t00066_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="450px" preserveAspectRatio="none" style="width:347px;height:450px;" version="1.1" viewBox="0 0 347 450" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwug5daupt116" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1m31oif0q7xee" 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"/>
@@ -9,222 +9,222 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwug5daupt116)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m31oif0q7xee)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="168.2422"/>
       <ellipse cx="18" cy="173.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="176.4526">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
       <ellipse cx="18" cy="186.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="189.2573">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="202.062">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
       <ellipse cx="18" cy="211.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="214.8667">A(const A &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
       <ellipse cx="18" cy="224.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="227.6714">~A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
       <ellipse cx="18" cy="237.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="240.4761">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
       <ellipse cx="18" cy="250.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
       <ellipse cx="18" cy="262.875" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="266.0854">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="278.8901">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="291.6948">operator++() : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="304.4995">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="309.0938"/>
       <ellipse cx="18" cy="314.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="317.3042">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="321.8984"/>
       <ellipse cx="18" cy="326.8984" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="330.1089">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="334.7031"/>
       <ellipse cx="18" cy="339.7031" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="342.9136">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="347.5078"/>
       <ellipse cx="18" cy="352.5078" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="355.7183">sum(const double a, const double b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="360.3125"/>
       <ellipse cx="18" cy="365.3125" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="368.5229">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <ellipse cx="18" cy="378.1172" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="381.3276">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="385.9219"/>
       <ellipse cx="18" cy="390.9219" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="394.1323">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="398.7266"/>
       <polygon fill="#FFFF44" points="18,398.7266,22,402.7266,18,406.7266,14,402.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="406.937">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="411.5313"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="413.5313"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="419.7417">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="424.3359"/>
       <polygon fill="#FFFF44" points="18,424.3359,22,428.3359,18,432.3359,14,428.3359" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="432.5464">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg
index 562efbe5..e9d56351 100644
--- a/docs/test_cases/t00066_class_mermaid.svg
+++ b/docs/test_cases/t00066_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 733" style="max-width: 400.75px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 733" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00066/t00066.cc#L7">
+        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00066/t00066.cc#L7">
           <g title="A" id="classId-C_0001899957281758233935-0" class="node default clickable">
             <rect height="717" width="384.75" y="-358.5" x="-192.375" class="outer title-state"/>
             <line y2="-328.5" y1="-328.5" x2="192.375" x1="-192.375" class="divider"/>
@@ -118,9 +118,9 @@
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -85)" height="18" width="73.359375">
+              <foreignObject transform="translate( -184.875, -85)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : void</span>
+                  <span class="nodeLabel">+A() : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, -63)" height="18" width="98.265625">
@@ -128,9 +128,9 @@
                   <span class="nodeLabel">+A(int i) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -41)" height="18" width="108.9375">
+              <foreignObject transform="translate( -184.875, -41)" height="18" width="170.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, -19)" height="18" width="140.078125">
@@ -138,9 +138,9 @@
                   <span class="nodeLabel">+A(const A &amp;) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 3)" height="18" width="82.703125">
+              <foreignObject transform="translate( -184.875, 3)" height="18" width="144.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : void</span>
+                  <span class="nodeLabel">+~A() : [default] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 25)" height="18" width="162.3125">
@@ -153,9 +153,9 @@
                   <span style="text-decoration:underline;" class="nodeLabel">+static_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 69)" height="18" width="163.203125">
+              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 91)" height="18" width="143.640625">
@@ -178,9 +178,9 @@
                   <span class="nodeLabel">+operator=(A &amp; other) : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 179)" height="18" width="133.828125">
+              <foreignObject transform="translate( -184.875, 179)" height="18" width="185.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : std::size_t</span>
+                  <span class="nodeLabel">+size() : [const] std::size_t</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 201)" height="18" width="191.671875">
diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md
index d512681a..05dafd12 100644
--- a/docs/test_cases/t00067.md
+++ b/docs/test_cases/t00067.md
@@ -527,7 +527,7 @@ int A::static_int = 1;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg
index 84b32a72..b21c7d5a 100644
--- a/docs/test_cases/t00067_class.svg
+++ b/docs/test_cases/t00067_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="322px" preserveAspectRatio="none" style="width:347px;height:322px;" version="1.1" viewBox="0 0 347 322" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1c71ymq8m96n6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fs1xo4yyp3aqi" 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"/>
@@ -9,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c71ymq8m96n6)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs1xo4yyp3aqi)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="53.2104">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="66.0151">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="78.8198">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="91.6245">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="104.4292">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="117.2339">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="130.0386">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <polygon fill="#FFFF44" points="18,134.6328,22,138.6328,18,142.6328,14,138.6328" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="142.8433">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="155.6479">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="160.2422"/>
       <ellipse cx="18" cy="165.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="168.4526">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="175.0469" y2="175.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="183.0469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="189.2573">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="202.062">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="208.6563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="214.8667">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="221.4609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="227.6714">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
       <polygon fill="#FFFF44" points="18,232.2656,22,236.2656,18,240.2656,14,236.2656" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="240.4761">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="247.0703"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="253.2808">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
       <polygon fill="none" points="18,257.875,22,261.875,18,265.875,14,261.875" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="266.0854">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="278.8901">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="291.6948">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="304.4995">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg
index 04a80ad4..1a3b9c63 100644
--- a/docs/test_cases/t00067_class_mermaid.svg
+++ b/docs/test_cases/t00067_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 513" style="max-width: 400.75px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 513" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t00067/t00067.cc#L6">
+        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t00067/t00067.cc#L6">
           <g title="A" id="classId-C_0000541140581420098839-0" class="node default clickable">
             <rect height="497" width="384.75" y="-248.5" x="-192.375" class="outer title-state"/>
             <line y2="-218.5" y1="-218.5" x2="192.375" x1="-192.375" class="divider"/>
@@ -128,9 +128,9 @@
                   <span class="nodeLabel">+basic_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 69)" height="18" width="163.203125">
+              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 91)" height="18" width="185">
@@ -158,9 +158,9 @@
                   <span class="nodeLabel">#protected_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 201)" height="18" width="133.828125">
+              <foreignObject transform="translate( -184.875, 201)" height="18" width="185.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : std::size_t</span>
+                  <span class="nodeLabel">+size() : [const] std::size_t</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -184.875, 223)" height="18" width="297.515625">
diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md
index 211dd779..c9f1d71a 100644
--- a/docs/test_cases/t20001.md
+++ b/docs/test_cases/t20001.md
@@ -23,6 +23,11 @@ diagrams:
         - "' t20001 test diagram of type {{ diagram.type }}"
       after:
         - '{% set e=element("clanguml::t20001::tmain()") %} note over {{ e.alias) }}: Main test function'
+    mermaid:
+      before:
+        - "%% t20001 test diagram of type {{ diagram.type }}"
+      after:
+        - '{% set e=element("clanguml::t20001::tmain()") %} Note over {{ e.alias) }}: Main test function'
 
 ```
 ## Source code
@@ -110,7 +115,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 69772616..5b3cabeb 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.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="585px" preserveAspectRatio="none" style="width:324px;height:585px;" version="1.1" viewBox="0 0 324 585" width="324px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1kmwbgrvg1xzg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fr2f3m7vupz6w" 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"/>
@@ -9,73 +9,73 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="440.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="187.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="259.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="297.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="366.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="444.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="230.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="440.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="187.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="259.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="297.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="366.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="444.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="230.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="77" x2="77" y1="38.2969" y2="545.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="175.5" x2="175.5" y1="38.2969" y2="545.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="303" x2="303" y1="38.2969" y2="545.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="544.4922"/>
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="544.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="564.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="544.4922"/>
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="544.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="564.4873">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1kmwbgrvg1xzg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="544.4922"/>
+      <rect fill="#FEFECE" filter="url(#fr2f3m7vupz6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="544.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="564.4873">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="440.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="187.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="259.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="297.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="366.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="444.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kmwbgrvg1xzg)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="230.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="440.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="187.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="259.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="297.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="366.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="444.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fr2f3m7vupz6w)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="230.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159,65.4297,169,69.4297,159,73.4297,163,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="165" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="89" y="64.3638">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="286,124.5625,296,128.5625,286,132.5625,290,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="292" y1="128.5625" y2="128.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="89" y="123.4966">B(A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159,183.6953,169,187.6953,159,191.6953,163,187.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="165" y1="187.6953" y2="187.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="89" y="182.6294">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="93,197.6953,83,201.6953,93,205.6953,89,201.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="87" x2="175" y1="201.6953" y2="201.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="286,226.8281,296,230.8281,286,234.8281,290,230.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="292" y1="230.8281" y2="230.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="89" y="225.7622">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,255.9609,182,259.9609,192,263.9609,188,259.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="259.9609" y2="259.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="198" y="254.895">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="228" y1="284.0938" y2="284.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="284.0938" y2="297.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="297.0938" y2="297.0938"/>
@@ -86,7 +86,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="228" x2="228" y1="321.0938" y2="334.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="228" y1="334.0938" y2="334.0938"/>
     <polygon fill="#A80036" points="191,330.0938,181,334.0938,191,338.0938,187,334.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="228" y1="358.2266" y2="358.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="358.2266" y2="371.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="371.2266" y2="371.2266"/>
@@ -95,14 +95,14 @@
     </a>
     <polygon fill="#A80036" points="286,411.2266,296,415.2266,286,419.2266,290,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="176" x2="292" y1="415.2266" y2="415.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,440.3594,182,444.3594,192,448.3594,188,444.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="444.3594" y2="444.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="198" y="439.2935">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="88,484.3594,78,488.3594,88,492.3594,84,488.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="82" x2="302" y1="488.3594" y2="488.3594"/>
-    <path d="M8,501.3594 L8,526.3594 L143,526.3594 L143,511.3594 L133,501.3594 L8,501.3594 " fill="#FBFB77" filter="url(#f1kmwbgrvg1xzg)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,501.3594 L8,526.3594 L143,526.3594 L143,511.3594 L133,501.3594 L8,501.3594 " fill="#FBFB77" filter="url(#fr2f3m7vupz6w)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M133,501.3594 L133,511.3594 L143,511.3594 L133,501.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="14" y="518.4263">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20001_sequence_mermaid.svg b/docs/test_cases/t20001_sequence_mermaid.svg
index 8f0edbdc..686a956b 100644
--- a/docs/test_cases/t20001_sequence_mermaid.svg
+++ b/docs/test_cases/t20001_sequence_mermaid.svg
@@ -1,24 +1,24 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 669" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 716" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
-    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="583" x="400"/>
-    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="615.5" x="475">
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="630" x="400"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="662.5" x="475">
       <tspan dy="0" x="475">B</tspan>
     </text>
   </g>
   <g>
-    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="583" x="200"/>
-    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="615.5" x="275">
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="630" x="200"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="662.5" x="275">
       <tspan dy="0" x="275">A</tspan>
     </text>
   </g>
   <g>
-    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="583" x="0"/>
-    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="615.5" x="75">
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="630" x="0"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="662.5" x="75">
       <tspan dy="0" x="75">tmain()</tspan>
     </text>
   </g>
   <g>
-    <line stroke="#999" stroke-width="0.5px" class="200" y2="583" x2="475" y1="5" x1="475" id="actor2"/>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="630" x2="475" y1="5" x1="475" id="actor2"/>
     <g id="root-2">
       <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="400"/>
       <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="475">
@@ -27,7 +27,7 @@
     </g>
   </g>
   <g>
-    <line stroke="#999" stroke-width="0.5px" class="200" y2="583" x2="275" y1="5" x1="275" id="actor1"/>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="630" x2="275" y1="5" x1="275" id="actor1"/>
     <g id="root-1">
       <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="200"/>
       <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="275">
@@ -36,7 +36,7 @@
     </g>
   </g>
   <g>
-    <line stroke="#999" stroke-width="0.5px" class="200" y2="583" x2="75" y1="5" x1="75" id="actor0"/>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="630" x2="75" y1="5" x1="75" id="actor0"/>
     <g id="root-0">
       <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="0"/>
       <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="75">
@@ -109,6 +109,12 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="547" x="270"/>
   </g>
+  <g>
+    <rect class="note" ry="0" rx="0" height="37" width="150" stroke="#666" fill="#EDF2AE" y="573" x="0"/>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="578" x="75">
+      <tspan x="75">Main test function</tspan>
+    </text>
+  </g>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">A()</text>
   <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="278">B(A &amp;)</text>
diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md
index 4f9c61c0..f78af2b5 100644
--- a/docs/test_cases/t20002.md
+++ b/docs/test_cases/t20002.md
@@ -47,7 +47,7 @@ void m1() { m2(); }
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 6080168e..f347da46 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.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="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f81za4uix0d6w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flzfa8eiyvs90" 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"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#f81za4uix0d6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#flzfa8eiyvs90)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f81za4uix0d6w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flzfa8eiyvs90)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20002_sequence_mermaid.svg b/docs/test_cases/t20002_sequence_mermaid.svg
index b759ec7c..856d0a45 100644
--- a/docs/test_cases/t20002_sequence_mermaid.svg
+++ b/docs/test_cases/t20002_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="115" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="147.5" x="675">
diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md
index 8af703a6..63b12e20 100644
--- a/docs/test_cases/t20003.md
+++ b/docs/test_cases/t20003.md
@@ -43,7 +43,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index 7c0be285..8a9dfb0b 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.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="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flmfl5jo2usq1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgpw47o3bdmjv" 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"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#flmfl5jo2usq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fgpw47o3bdmjv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flmfl5jo2usq1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpw47o3bdmjv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20003_sequence_mermaid.svg b/docs/test_cases/t20003_sequence_mermaid.svg
index a018550c..6541cbff 100644
--- a/docs/test_cases/t20003_sequence_mermaid.svg
+++ b/docs/test_cases/t20003_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="115" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="147.5" x="675">
diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md
index 8da5ead5..a6556ab6 100644
--- a/docs/test_cases/t20004.md
+++ b/docs/test_cases/t20004.md
@@ -79,7 +79,7 @@ int main()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index 5ad0e1e9..0be1623b 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.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="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fssxhjqh2pk7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10anu5lame7vv" 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"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
@@ -29,87 +29,87 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fssxhjqh2pk7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10anu5lame7vv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fssxhjqh2pk7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10anu5lame7vv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
@@ -117,11 +117,11 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
     <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
@@ -129,19 +129,19 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
     <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
diff --git a/docs/test_cases/t20004_sequence_mermaid.svg b/docs/test_cases/t20004_sequence_mermaid.svg
index 6d8e9e91..20b66b63 100644
--- a/docs/test_cases/t20004_sequence_mermaid.svg
+++ b/docs/test_cases/t20004_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 2344 351" style="max-width: 2344px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 2344 351" style="max-width: 2344px; background-color: white;" width="2344" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="265" x="2094"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="297.5" x="2169">
diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md
index a38c8461..915bdf02 100644
--- a/docs/test_cases/t20005.md
+++ b/docs/test_cases/t20005.md
@@ -50,7 +50,7 @@ template <typename T> struct C {
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index 9b5f1ba1..613d48b9 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.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="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frzqydfeesrns" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3pxiq9tif2d0" 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"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frzqydfeesrns)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f3pxiq9tif2d0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frzqydfeesrns)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f3pxiq9tif2d0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
diff --git a/docs/test_cases/t20005_sequence_mermaid.svg b/docs/test_cases/t20005_sequence_mermaid.svg
index 8bb98453..63cb6780 100644
--- a/docs/test_cases/t20005_sequence_mermaid.svg
+++ b/docs/test_cases/t20005_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 339" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 339" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="253" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="285.5" x="675">
diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md
index cd7307bb..7b407bea 100644
--- a/docs/test_cases/t20006.md
+++ b/docs/test_cases/t20006.md
@@ -108,7 +108,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index a43a354f..8bcb06fa 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.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="872px" preserveAspectRatio="none" style="width:986px;height:872px;" version="1.1" viewBox="0 0 986 872" width="986px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13ivacjq2jwh4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="few6vz589h02w" 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"/>
@@ -9,24 +9,24 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="832.5547"/>
@@ -36,84 +36,84 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="842" x2="842" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="940" x2="940" y1="38.2969" y2="832.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="851.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="851.5498">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="851.5498">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="851.5498">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="851.5498">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="851.5498">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="851.5498">BB&lt;int,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="851.5498">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13ivacjq2jwh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#few6vz589h02w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="851.5498">AA&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f13ivacjq2jwh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#few6vz589h02w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
@@ -122,12 +122,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
@@ -136,69 +136,69 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,237.9609,576,241.9609,566,245.9609,570,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="53" y="236.895">BB(AA&lt;int&gt; *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,297.0938,719,301.0938,709,305.0938,713,301.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="301.0938" y2="301.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="99" x="53" y="296.0278">BB(AA&lt;int&gt; &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,356.2266,835,360.2266,825,364.2266,829,360.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="360.2266" y2="360.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="355.1606">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,385.3594,933.5,389.3594,923.5,393.3594,927.5,389.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="389.3594" y2="389.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="384.2935">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,444.4922,835,448.4922,825,452.4922,829,448.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="448.4922" y2="448.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="443.4263">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,473.625,933.5,477.625,923.5,481.625,927.5,477.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="477.625" y2="477.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="472.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,532.7578,576,536.7578,566,540.7578,570,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="536.7578" y2="536.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="531.6919">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,561.8906,933.5,565.8906,923.5,569.8906,927.5,565.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="565.8906" y2="565.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="560.8247">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,621.0234,576,625.0234,566,629.0234,570,625.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="625.0234" y2="625.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="619.9575">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,650.1563,933.5,654.1563,923.5,658.1563,927.5,654.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="654.1563" y2="654.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="649.0903">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,709.2891,719,713.2891,709,717.2891,713,713.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="713.2891" y2="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="708.2231">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="731" x2="778" y1="737.4219" y2="737.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="778" x2="778" y1="737.4219" y2="750.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="737" x2="778" y1="750.4219" y2="750.4219"/>
       <polygon fill="#A80036" points="747,746.4219,737,750.4219,747,754.4219,743,750.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="743" y="732.356">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,780.5547,933.5,784.5547,923.5,788.5547,927.5,784.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="736" x2="929.5" y1="784.5547" y2="784.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="743" y="779.4888">aa2(int)</text>
diff --git a/docs/test_cases/t20006_sequence_mermaid.svg b/docs/test_cases/t20006_sequence_mermaid.svg
index e09f86e5..33f9eca7 100644
--- a/docs/test_cases/t20006_sequence_mermaid.svg
+++ b/docs/test_cases/t20006_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1850 1023" style="max-width: 1850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1850 1023" style="max-width: 1850px; background-color: white;" width="1850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="937" x="1600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="969.5" x="1675">
diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md
index 57060d56..5bff624d 100644
--- a/docs/test_cases/t20007.md
+++ b/docs/test_cases/t20007.md
@@ -54,7 +54,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index d38bf8db..550854f6 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.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="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2varx7so796i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f114xapuqee4y6" 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"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2varx7so796i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f114xapuqee4y6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f2varx7so796i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f114xapuqee4y6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
diff --git a/docs/test_cases/t20007_sequence_mermaid.svg b/docs/test_cases/t20007_sequence_mermaid.svg
index d41ca006..44578764 100644
--- a/docs/test_cases/t20007_sequence_mermaid.svg
+++ b/docs/test_cases/t20007_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1004 339" style="max-width: 1004px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1004 339" style="max-width: 1004px; background-color: white;" width="1004" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="278" stroke="#666" fill="#eaeaea" y="253" x="626"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="285.5" x="765">
diff --git a/docs/test_cases/t20008.md b/docs/test_cases/t20008.md
index e2746d2c..4f5c736c 100644
--- a/docs/test_cases/t20008.md
+++ b/docs/test_cases/t20008.md
@@ -72,7 +72,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 19251b4e..e6c63f2f 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.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="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fk39fjdd2hdmi" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwprv3ywdv0cu" 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"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fk39fjdd2hdmi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fwprv3ywdv0cu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fk39fjdd2hdmi)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fwprv3ywdv0cu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
diff --git a/docs/test_cases/t20008_sequence_mermaid.svg b/docs/test_cases/t20008_sequence_mermaid.svg
index 17aaaa5d..12de9b96 100644
--- a/docs/test_cases/t20008_sequence_mermaid.svg
+++ b/docs/test_cases/t20008_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1450 447" style="max-width: 1450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1450 447" style="max-width: 1450px; background-color: white;" width="1450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="361" x="1200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="393.5" x="1275">
diff --git a/docs/test_cases/t20009.md b/docs/test_cases/t20009.md
index 03d133dc..57c69149 100644
--- a/docs/test_cases/t20009.md
+++ b/docs/test_cases/t20009.md
@@ -58,7 +58,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index d76e4fd7..50ff4243 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.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="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ez2owupdkamb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fi00zt6k7fouv" 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"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ez2owupdkamb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fi00zt6k7fouv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ez2owupdkamb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fi00zt6k7fouv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
diff --git a/docs/test_cases/t20009_sequence_mermaid.svg b/docs/test_cases/t20009_sequence_mermaid.svg
index 5ce7e173..a5ffc27e 100644
--- a/docs/test_cases/t20009_sequence_mermaid.svg
+++ b/docs/test_cases/t20009_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1450 447" style="max-width: 1450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1450 447" style="max-width: 1450px; background-color: white;" width="1450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="361" x="1200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="393.5" x="1275">
diff --git a/docs/test_cases/t20010.md b/docs/test_cases/t20010.md
index bdb62839..cc9b949e 100644
--- a/docs/test_cases/t20010.md
+++ b/docs/test_cases/t20010.md
@@ -68,7 +68,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 0b553367..c9c547ff 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.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="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1f3xu59af8k4l" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fp9avy2qe1hin" 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"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1f3xu59af8k4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fp9avy2qe1hin)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1f3xu59af8k4l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fp9avy2qe1hin)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
diff --git a/docs/test_cases/t20010_sequence_mermaid.svg b/docs/test_cases/t20010_sequence_mermaid.svg
index b3a99f04..f8beb39e 100644
--- a/docs/test_cases/t20010_sequence_mermaid.svg
+++ b/docs/test_cases/t20010_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 539" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 539" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="453" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="485.5" x="475">
diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md
index 0681cea1..dbe6d8d7 100644
--- a/docs/test_cases/t20011.md
+++ b/docs/test_cases/t20011.md
@@ -60,7 +60,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index 5508fc56..e6a8f503 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.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="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fsdwbi49f2q81" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxjqdoh6drypd" 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"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsdwbi49f2q81)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxjqdoh6drypd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fsdwbi49f2q81)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#fxjqdoh6drypd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsdwbi49f2q81)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxjqdoh6drypd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fsdwbi49f2q81)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#fxjqdoh6drypd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fsdwbi49f2q81)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fxjqdoh6drypd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
@@ -52,26 +52,26 @@
     <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
       <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
@@ -81,14 +81,14 @@
     <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
       <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
@@ -98,7 +98,7 @@
     <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
diff --git a/docs/test_cases/t20011_sequence_mermaid.svg b/docs/test_cases/t20011_sequence_mermaid.svg
index b9e6399d..c412119f 100644
--- a/docs/test_cases/t20011_sequence_mermaid.svg
+++ b/docs/test_cases/t20011_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 490 884" style="max-width: 490px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 490 884" style="max-width: 490px; background-color: white;" width="490" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="798" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="830.5" x="275">
diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md
index e1728140..7bb259fe 100644
--- a/docs/test_cases/t20012.md
+++ b/docs/test_cases/t20012.md
@@ -135,7 +135,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index a05ce0fe..37e7905d 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.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="1219px" preserveAspectRatio="none" style="width:1745px;height:1219px;" version="1.1" viewBox="0 0 1745 1219" width="1745px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f63e5rjfldweb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fviklhnjq1j7" 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"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="1004.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="1004.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="272" x2="272" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="484" x2="484" y1="38.2969" y2="1179.4844"/>
@@ -42,116 +42,116 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="972.5" x2="972.5" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1178.5" x2="1178.5" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1554.5" x2="1554.5" y1="38.2969" y2="1179.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1198.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="1198.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="1198.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="1198.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:80:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:80:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="1198.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="1198.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="22.9951">R&lt;R::(lambda ../../tests/t20012/t20012.cc:86:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="1198.4795">R&lt;R::(lambda ../../tests/t20012/t20012.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:86:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:86:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)</text>
-      <rect fill="#FEFECE" filter="url(#f63e5rjfldweb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1fviklhnjq1j7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="1198.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f63e5rjfldweb)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="1004.0859"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1fviklhnjq1j7)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="1004.0859"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="255.5,65.4297,265.5,69.4297,255.5,73.4297,259.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="261.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,94.5625,477.5,98.5625,467.5,102.5625,471.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="505.5,131.6953,495.5,135.6953,505.5,139.6953,501.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="510.5,178.8281,500.5,182.8281,510.5,186.8281,506.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,237.9609,540.5,241.9609,530.5,245.9609,534.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="568.5,275.0938,558.5,279.0938,568.5,283.0938,564.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="326.2266" y2="326.2266"/>
@@ -160,67 +160,67 @@
     </a>
     <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="271.5" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="743,395.3594,753,399.3594,743,403.3594,747,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="749" y1="399.3594" y2="399.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="955.5,424.4922,965.5,428.4922,955.5,432.4922,959.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="765" x2="961.5" y1="428.4922" y2="428.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="772" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="452.625" y2="452.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="452.625" y2="465.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="465.625" y2="465.625"/>
       <polygon fill="#A80036" points="993.5,461.625,983.5,465.625,993.5,469.625,989.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="499.7578" y2="499.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="499.7578" y2="512.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="512.7578" y2="512.7578"/>
       <polygon fill="#A80036" points="998.5,508.7578,988.5,512.7578,998.5,516.7578,994.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="994.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288.5,567.8906,278.5,571.8906,288.5,575.8906,284.5,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282.5" x2="754" y1="571.8906" y2="571.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="294.5" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,597.0234,477.5,601.0234,467.5,605.0234,471.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="601.0234" y2="601.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="625.1563" y2="625.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="625.1563" y2="638.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="638.1563" y2="638.1563"/>
       <polygon fill="#A80036" points="505.5,634.1563,495.5,638.1563,505.5,642.1563,501.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="672.2891" y2="672.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="672.2891" y2="685.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="685.2891" y2="685.2891"/>
       <polygon fill="#A80036" points="510.5,681.2891,500.5,685.2891,510.5,689.2891,506.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,740.4219,540.5,744.4219,530.5,748.4219,534.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="744.4219" y2="744.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="768.5547" y2="768.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="768.5547" y2="781.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="781.5547" y2="781.5547"/>
       <polygon fill="#A80036" points="568.5,777.5547,558.5,781.5547,568.5,785.5547,564.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="815.6875" y2="815.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="815.6875" y2="828.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="828.6875" y2="828.6875"/>
@@ -231,34 +231,34 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="272.5" x2="749" y1="872.6875" y2="872.6875"/>
     <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="759" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1161.5,911.8203,1171.5,915.8203,1161.5,919.8203,1165.5,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1167.5" y1="915.8203" y2="915.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="53" y="910.7544">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1161.5,970.9531,1171.5,974.9531,1161.5,978.9531,1165.5,974.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1167.5" y1="974.9531" y2="974.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="969.8872">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1537.5,1000.0859,1547.5,1004.0859,1537.5,1008.0859,1541.5,1004.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1183.5" x2="1543.5" y1="1004.0859" y2="1004.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="1190.5" y="999.02">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="988.5,1029.2188,978.5,1033.2188,988.5,1037.2188,984.5,1033.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="982.5" x2="1548.5" y1="1033.2188" y2="1033.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="994.5" y="1028.1528">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="1057.3516" y2="1057.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="1057.3516" y2="1070.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="1070.3516" y2="1070.3516"/>
       <polygon fill="#A80036" points="993.5,1066.3516,983.5,1070.3516,993.5,1074.3516,989.5,1070.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="1052.2856">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="1104.4844" y2="1104.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="1104.4844" y2="1117.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="1117.4844" y2="1117.4844"/>
diff --git a/docs/test_cases/t20012_sequence_mermaid.svg b/docs/test_cases/t20012_sequence_mermaid.svg
index 153b3b84..f2682488 100644
--- a/docs/test_cases/t20012_sequence_mermaid.svg
+++ b/docs/test_cases/t20012_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 2418 1675" style="max-width: 2418px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 2418 1675" style="max-width: 2418px; background-color: white;" width="2418" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="340" stroke="#666" fill="#eaeaea" y="1589" x="1978"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1621.5" x="2148">
diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md
index ac6f5c3e..700e2a38 100644
--- a/docs/test_cases/t20013.md
+++ b/docs/test_cases/t20013.md
@@ -56,7 +56,7 @@ void tmain(int argc, char **argv)
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index e2d0bf59..58318b92 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.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="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxogw8x6x8yoq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1f56fhy38maom" 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"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fxogw8x6x8yoq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f56fhy38maom)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fxogw8x6x8yoq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f56fhy38maom)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -58,12 +58,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
@@ -72,12 +72,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
diff --git a/docs/test_cases/t20013_sequence_mermaid.svg b/docs/test_cases/t20013_sequence_mermaid.svg
index 06076e9a..9113c14e 100644
--- a/docs/test_cases/t20013_sequence_mermaid.svg
+++ b/docs/test_cases/t20013_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 507" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 507" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="421" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="453.5" x="475">
diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md
index 1e6dd4bd..79474a58 100644
--- a/docs/test_cases/t20014.md
+++ b/docs/test_cases/t20014.md
@@ -91,7 +91,7 @@ namespace t20014 {
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 915a1ef4..50e68453 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.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="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1816s268grgmy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15i7i1o4acrq2" 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"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1816s268grgmy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f15i7i1o4acrq2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1816s268grgmy)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f15i7i1o4acrq2)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
@@ -67,12 +67,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
@@ -81,17 +81,17 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
diff --git a/docs/test_cases/t20014_sequence_mermaid.svg b/docs/test_cases/t20014_sequence_mermaid.svg
index 96fa12c5..701f40f7 100644
--- a/docs/test_cases/t20014_sequence_mermaid.svg
+++ b/docs/test_cases/t20014_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 563" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 563" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="477" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="509.5" x="675">
diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md
index ad9c62fb..c85feeb2 100644
--- a/docs/test_cases/t20015.md
+++ b/docs/test_cases/t20015.md
@@ -72,7 +72,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index 207eded8..6436b73e 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.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="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11n082vnzfzul" width="300%" x="-1" y="-1">
+    <filter height="300%" id="frzqr5fxm68c9" 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"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f11n082vnzfzul)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11n082vnzfzul)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#frzqr5fxm68c9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#frzqr5fxm68c9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11n082vnzfzul)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frzqr5fxm68c9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f11n082vnzfzul)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#frzqr5fxm68c9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11n082vnzfzul)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frzqr5fxm68c9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f11n082vnzfzul)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#frzqr5fxm68c9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f11n082vnzfzul)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11n082vnzfzul)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#frzqr5fxm68c9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#frzqr5fxm68c9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
diff --git a/docs/test_cases/t20015_sequence_mermaid.svg b/docs/test_cases/t20015_sequence_mermaid.svg
index 6091c2ba..15fab6f5 100644
--- a/docs/test_cases/t20015_sequence_mermaid.svg
+++ b/docs/test_cases/t20015_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 565 217" style="max-width: 565px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 565 217" style="max-width: 565px; background-color: white;" width="565" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="131" x="315"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="163.5" x="390">
diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md
index ed19dbf0..b984d473 100644
--- a/docs/test_cases/t20016.md
+++ b/docs/test_cases/t20016.md
@@ -54,7 +54,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 7b3e03b3..18587d60 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.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="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vgloz0vczdx7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpxzgmf5difj" 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"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1vgloz0vczdx7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fpxzgmf5difj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1vgloz0vczdx7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpxzgmf5difj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
diff --git a/docs/test_cases/t20016_sequence_mermaid.svg b/docs/test_cases/t20016_sequence_mermaid.svg
index d3ae9e04..a4e11094 100644
--- a/docs/test_cases/t20016_sequence_mermaid.svg
+++ b/docs/test_cases/t20016_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 375" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 375" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="289" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="321.5" x="475">
diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md
index 0ecd9cc0..1ca9721b 100644
--- a/docs/test_cases/t20017.md
+++ b/docs/test_cases/t20017.md
@@ -51,7 +51,7 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); }
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index c0570a73..96e9748b 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.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="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fakfwz8b9uyxx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhvpm9dcnz4jr" 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"/>
@@ -9,65 +9,65 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#fakfwz8b9uyxx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fhvpm9dcnz4jr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fakfwz8b9uyxx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fhvpm9dcnz4jr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
diff --git a/docs/test_cases/t20017_sequence_mermaid.svg b/docs/test_cases/t20017_sequence_mermaid.svg
index 5e91be23..27d40e19 100644
--- a/docs/test_cases/t20017_sequence_mermaid.svg
+++ b/docs/test_cases/t20017_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 860 507" style="max-width: 860px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 860 507" style="max-width: 860px; background-color: white;" width="860" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="155" stroke="#666" fill="#eaeaea" y="421" x="605"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="453.5" x="682.5">
diff --git a/docs/test_cases/t20018.md b/docs/test_cases/t20018.md
index 2aae965a..87918e83 100644
--- a/docs/test_cases/t20018.md
+++ b/docs/test_cases/t20018.md
@@ -56,7 +56,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index a034ab19..6fb88792 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.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="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f187h7rnk92e9v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13k0tq8aa2afb" 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"/>
@@ -9,14 +9,14 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
@@ -25,93 +25,93 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f187h7rnk92e9v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f13k0tq8aa2afb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f187h7rnk92e9v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f13k0tq8aa2afb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
diff --git a/docs/test_cases/t20018_sequence_mermaid.svg b/docs/test_cases/t20018_sequence_mermaid.svg
index ce997fae..93ba205f 100644
--- a/docs/test_cases/t20018_sequence_mermaid.svg
+++ b/docs/test_cases/t20018_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1699 493" style="max-width: 1699px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1699 493" style="max-width: 1699px; background-color: white;" width="1699" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="407" x="1449"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="439.5" x="1524">
diff --git a/docs/test_cases/t20019.md b/docs/test_cases/t20019.md
index 3333bd68..000ea856 100644
--- a/docs/test_cases/t20019.md
+++ b/docs/test_cases/t20019.md
@@ -63,7 +63,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index be973318..d32f4836 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.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="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13pu8ub1lptn9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13a9wzv70j93l" 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"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#f13pu8ub1lptn9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f13a9wzv70j93l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f13pu8ub1lptn9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f13a9wzv70j93l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
diff --git a/docs/test_cases/t20019_sequence_mermaid.svg b/docs/test_cases/t20019_sequence_mermaid.svg
index a03fda27..51597fd2 100644
--- a/docs/test_cases/t20019_sequence_mermaid.svg
+++ b/docs/test_cases/t20019_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 539" style="max-width: 1050px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 539" style="max-width: 1050px; background-color: white;" width="1050" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="453" x="800"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="485.5" x="875">
diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md
index d646cfb8..b4b03b95 100644
--- a/docs/test_cases/t20020.md
+++ b/docs/test_cases/t20020.md
@@ -119,7 +119,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index d0765161..84e43688 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.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="879px" preserveAspectRatio="none" style="width:385px;height:879px;" version="1.1" viewBox="0 0 385 879" width="385px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fe5itclu1822r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc0bhw6hlfgb7" 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"/>
@@ -9,82 +9,82 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="115.5625"/>
     <rect fill="#FFFFFF" height="250.7969" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="160.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="271.5" x="23" y="316.2266"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="411.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="329.5" x2="329.5" y1="38.2969" y2="839.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="858.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="858.6826">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="858.6826">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="858.6826">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fe5itclu1822r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fc0bhw6hlfgb7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="858.6826">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fe5itclu1822r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fc0bhw6hlfgb7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
@@ -92,7 +92,7 @@
     <polygon fill="#A80036" points="82,103.5625,72,107.5625,82,111.5625,78,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="107.5625" y2="107.5625"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="116.5625" y2="116.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,134.6953,126,138.6953,116,142.6953,120,138.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="138.6953" y2="138.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="133.6294">a5()</text>
@@ -103,7 +103,7 @@
     <path d="M23,169.6953 L87,169.6953 L87,176.6953 L77,186.6953 L23,186.6953 L23,169.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="182.7622">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,203.9609,126,207.9609,116,211.9609,120,207.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="207.9609" y2="207.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="202.895">[</text>
@@ -112,7 +112,7 @@
     </a>
     <polygon fill="#A80036" points="82,217.9609,72,221.9609,82,225.9609,78,221.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="221.9609" y2="221.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,247.0938,163.5,251.0938,153.5,255.0938,157.5,251.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="251.0938" y2="251.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="246.0278">[</text>
@@ -121,7 +121,7 @@
     </a>
     <polygon fill="#A80036" points="82,261.0938,72,265.0938,82,269.0938,78,265.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="265.0938" y2="265.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,290.2266,263.5,294.2266,253.5,298.2266,257.5,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="289.1606">b1()</text>
@@ -129,7 +129,7 @@
     <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="308.2266" y2="308.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="294.5" y1="317.2266" y2="317.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,335.3594,126,339.3594,116,343.3594,120,339.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="339.3594" y2="339.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="334.2935">[</text>
@@ -138,7 +138,7 @@
     </a>
     <polygon fill="#A80036" points="82,349.3594,72,353.3594,82,357.3594,78,353.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="353.3594" y2="353.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,378.4922,263.5,382.4922,253.5,386.4922,257.5,382.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="382.4922" y2="382.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="377.4263">b2()</text>
@@ -146,14 +146,14 @@
     <polygon fill="#A80036" points="82,392.4922,72,396.4922,82,400.4922,78,396.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="396.4922" y2="396.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="412.4922" y2="412.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,430.625,126,434.625,116,438.625,120,434.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="434.625" y2="434.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="429.5591">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,444.625,72,448.625,82,452.625,78,448.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="448.625" y2="448.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,480.7578,263.5,484.7578,253.5,488.7578,257.5,484.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="484.7578" y2="484.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="479.6919">log()</text>
@@ -161,7 +161,7 @@
     <path d="M23,529.7578 L87,529.7578 L87,536.7578 L77,546.7578 L23,546.7578 L23,529.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="542.8247">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,564.0234,163.5,568.0234,153.5,572.0234,157.5,568.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="568.0234" y2="568.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="78" y="562.9575">c1() const</text>
@@ -169,7 +169,7 @@
     <path d="M146.5,583.0234 L210.5,583.0234 L210.5,590.0234 L200.5,600.0234 L146.5,600.0234 L146.5,583.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="596.0903">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="616.2891" y2="616.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="616.2891" y2="629.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="629.2891" y2="629.2891"/>
@@ -182,7 +182,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="653.2891" y2="666.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="666.2891" y2="666.2891"/>
     <polygon fill="#A80036" points="185.5,662.2891,175.5,666.2891,185.5,670.2891,181.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="690.4219" y2="690.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="690.4219" y2="703.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="703.4219" y2="703.4219"/>
@@ -192,7 +192,7 @@
     <path d="M23,762.4219 L87,762.4219 L87,769.4219 L77,779.4219 L23,779.4219 L23,762.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="775.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="312.5,796.6875,322.5,800.6875,312.5,804.6875,316.5,800.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="318.5" y1="800.6875" y2="800.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="795.6216">d1(int,int)</text>
diff --git a/docs/test_cases/t20020_sequence_mermaid.svg b/docs/test_cases/t20020_sequence_mermaid.svg
index bd77292b..df3f9b5a 100644
--- a/docs/test_cases/t20020_sequence_mermaid.svg
+++ b/docs/test_cases/t20020_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 1300" style="max-width: 1050px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 1300" style="max-width: 1050px; background-color: white;" width="1050" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="1214" x="800"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1246.5" x="875">
diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md
index afe52587..e327bb2b 100644
--- a/docs/test_cases/t20021.md
+++ b/docs/test_cases/t20021.md
@@ -86,7 +86,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index 62088109..592d6a6c 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.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="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17uryxwjk1j0v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fncdcqiwrmnvf" 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"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f17uryxwjk1j0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fncdcqiwrmnvf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f17uryxwjk1j0v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fncdcqiwrmnvf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
     <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
@@ -89,7 +89,7 @@
     <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
@@ -102,7 +102,7 @@
     <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
@@ -120,7 +120,7 @@
     </a>
     <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
@@ -129,14 +129,14 @@
     </a>
     <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
     <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
@@ -148,7 +148,7 @@
     <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="552.9575">b2() const</text>
@@ -158,7 +158,7 @@
     <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
@@ -167,7 +167,7 @@
     </a>
     <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="677.356">b2() const</text>
diff --git a/docs/test_cases/t20021_sequence_mermaid.svg b/docs/test_cases/t20021_sequence_mermaid.svg
index b1eab8f0..5b801fd5 100644
--- a/docs/test_cases/t20021_sequence_mermaid.svg
+++ b/docs/test_cases/t20021_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 1070" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 1070" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="984" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1016.5" x="675">
diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md
index ad679896..83239d69 100644
--- a/docs/test_cases/t20022.md
+++ b/docs/test_cases/t20022.md
@@ -66,7 +66,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 770c0b7d..805cd976 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.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="245px" preserveAspectRatio="none" style="width:254px;height:245px;" version="1.1" viewBox="0 0 254 245" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fe3yulm18dsr2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbcmpdmqfs3ta" 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"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="185.5" x2="185.5" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="233" x2="233" y1="38.2969" y2="205.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="224.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="224.6904">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fe3yulm18dsr2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#fbcmpdmqfs3ta)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="224.6904">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fe3yulm18dsr2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbcmpdmqfs3ta)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,65.4297,179,69.4297,169,73.4297,173,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="53" y="64.3638">A(std::unique_ptr</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="163" y="64.3638">)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,124.5625,179,128.5625,169,132.5625,173,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="128.5625" y2="128.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="123.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="216,153.6953,226,157.6953,216,161.6953,220,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="191" x2="222" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="198" y="152.6294">b()</text>
diff --git a/docs/test_cases/t20022_sequence_mermaid.svg b/docs/test_cases/t20022_sequence_mermaid.svg
index 9baa294f..d9408adc 100644
--- a/docs/test_cases/t20022_sequence_mermaid.svg
+++ b/docs/test_cases/t20022_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 668 309" style="max-width: 668px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 668 309" style="max-width: 668px; background-color: white;" width="668" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="223" x="418"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="255.5" x="493">
diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md
index a336c8e5..174c711f 100644
--- a/docs/test_cases/t20023.md
+++ b/docs/test_cases/t20023.md
@@ -69,7 +69,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index dce29435..9ff383ac 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.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="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o71rigcgzd8l" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fg3khja1odj61" 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"/>
@@ -9,37 +9,37 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o71rigcgzd8l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3khja1odj61)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1o71rigcgzd8l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fg3khja1odj61)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o71rigcgzd8l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3khja1odj61)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1o71rigcgzd8l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fg3khja1odj61)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1o71rigcgzd8l)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fg3khja1odj61)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
@@ -47,7 +47,7 @@
     <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
@@ -73,7 +73,7 @@
     <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
@@ -86,7 +86,7 @@
     <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
diff --git a/docs/test_cases/t20023_sequence_mermaid.svg b/docs/test_cases/t20023_sequence_mermaid.svg
index 663706f6..724fa9de 100644
--- a/docs/test_cases/t20023_sequence_mermaid.svg
+++ b/docs/test_cases/t20023_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 470 921" style="max-width: 470px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 470 921" style="max-width: 470px; background-color: white;" width="470" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="835" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="867.5" x="275">
diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md
index 7f0b4e50..02b7bf24 100644
--- a/docs/test_cases/t20024.md
+++ b/docs/test_cases/t20024.md
@@ -94,7 +94,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 4444bb9b..622df532 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.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="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhydljth784ed" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f169hz49stfehl" 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"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
@@ -33,36 +33,36 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fhydljth784ed)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f169hz49stfehl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#fhydljth784ed)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f169hz49stfehl)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
@@ -85,7 +85,7 @@
     <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
@@ -98,7 +98,7 @@
     <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
@@ -111,7 +111,7 @@
     <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
@@ -124,7 +124,7 @@
     <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
@@ -134,7 +134,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
@@ -143,7 +143,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
@@ -152,7 +152,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
@@ -161,7 +161,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
diff --git a/docs/test_cases/t20024_sequence_mermaid.svg b/docs/test_cases/t20024_sequence_mermaid.svg
index 4700dffe..f7db7c3e 100644
--- a/docs/test_cases/t20024_sequence_mermaid.svg
+++ b/docs/test_cases/t20024_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 665 1609" style="max-width: 665px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 665 1609" style="max-width: 665px; background-color: white;" width="665" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="1523" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1555.5" x="475">
diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md
index af41e7c6..c76896cf 100644
--- a/docs/test_cases/t20025.md
+++ b/docs/test_cases/t20025.md
@@ -74,7 +74,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index fe392bee..1d5f8f20 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.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="241px" preserveAspectRatio="none" style="width:220px;height:241px;" version="1.1" viewBox="0 0 220 241" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1es1s55toqm9f" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13isselrt6519" 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"/>
@@ -9,41 +9,41 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="201.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="220.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="220.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1es1s55toqm9f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f13isselrt6519)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="220.5576">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1es1s55toqm9f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13isselrt6519)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="107.5" x2="149.5" y1="98.5625" y2="98.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="98.5625" y2="111.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="111.5625" y2="111.5625"/>
@@ -52,7 +52,7 @@
     </a>
     <polygon fill="#A80036" points="57,151.5625,47,155.5625,57,159.5625,53,155.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="155.5625" y2="155.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,165.5625,160,169.5625,150,173.5625,154,169.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="169.5625" y2="169.5625"/>
     </a>
diff --git a/docs/test_cases/t20025_sequence_mermaid.svg b/docs/test_cases/t20025_sequence_mermaid.svg
index 0516f053..555db82f 100644
--- a/docs/test_cases/t20025_sequence_mermaid.svg
+++ b/docs/test_cases/t20025_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 323" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 323" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="237" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="269.5" x="475">
diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md
index addb62f8..f8ae620f 100644
--- a/docs/test_cases/t20026.md
+++ b/docs/test_cases/t20026.md
@@ -54,7 +54,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index cc58a4e8..09485d7b 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.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="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8xdwr31q3248" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18unrxan7ysac" 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"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f8xdwr31q3248)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f8xdwr31q3248)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18unrxan7ysac)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18unrxan7ysac)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8xdwr31q3248)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18unrxan7ysac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f8xdwr31q3248)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f18unrxan7ysac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8xdwr31q3248)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18unrxan7ysac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f8xdwr31q3248)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f18unrxan7ysac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f8xdwr31q3248)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f8xdwr31q3248)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f18unrxan7ysac)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18unrxan7ysac)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20026_sequence_mermaid.svg b/docs/test_cases/t20026_sequence_mermaid.svg
index 49209c1b..121a3afb 100644
--- a/docs/test_cases/t20026_sequence_mermaid.svg
+++ b/docs/test_cases/t20026_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 217" style="max-width: 450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 217" style="max-width: 450px; background-color: white;" width="450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="131" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="163.5" x="275">
diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md
index 8ed41e17..a1eb9e17 100644
--- a/docs/test_cases/t20027.md
+++ b/docs/test_cases/t20027.md
@@ -53,7 +53,7 @@ void tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index 7e27e86c..3437ff74 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.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="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxzjnjw7aodpl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fjsi14hhndgoz" 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"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fxzjnjw7aodpl)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxzjnjw7aodpl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjsi14hhndgoz)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjsi14hhndgoz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxzjnjw7aodpl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjsi14hhndgoz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fxzjnjw7aodpl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fjsi14hhndgoz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxzjnjw7aodpl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjsi14hhndgoz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fxzjnjw7aodpl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fjsi14hhndgoz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fxzjnjw7aodpl)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxzjnjw7aodpl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fjsi14hhndgoz)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjsi14hhndgoz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20027_sequence_mermaid.svg b/docs/test_cases/t20027_sequence_mermaid.svg
index 49209c1b..121a3afb 100644
--- a/docs/test_cases/t20027_sequence_mermaid.svg
+++ b/docs/test_cases/t20027_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 217" style="max-width: 450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 217" style="max-width: 450px; background-color: white;" width="450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="131" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="163.5" x="275">
diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md
index da9c342c..f67267b9 100644
--- a/docs/test_cases/t20028.md
+++ b/docs/test_cases/t20028.md
@@ -63,7 +63,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 01f07481..0ae142ba 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.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="304px" preserveAspectRatio="none" style="width:150px;height:304px;" version="1.1" viewBox="0 0 150 304" width="150px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6qgwix8shs2w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15uijvg4dwz7c" 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"/>
@@ -9,36 +9,36 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="125.5" x="13" y="201.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="114.5" x2="114.5" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6qgwix8shs2w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15uijvg4dwz7c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f6qgwix8shs2w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f15uijvg4dwz7c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6qgwix8shs2w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15uijvg4dwz7c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f6qgwix8shs2w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f15uijvg4dwz7c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f6qgwix8shs2w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f15uijvg4dwz7c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,89.5625,108,93.5625,98,97.5625,102,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="88.4966">[</text>
@@ -47,14 +47,14 @@
     </a>
     <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,132.6953,108,136.6953,98,140.6953,102,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="136.6953" y2="136.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
     <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,175.8281,108,179.8281,98,183.8281,102,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="179.8281" y2="179.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
@@ -62,7 +62,7 @@
     <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="138.5" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,220.9609,108,224.9609,98,228.9609,102,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="224.9609" y2="224.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
diff --git a/docs/test_cases/t20028_sequence_mermaid.svg b/docs/test_cases/t20028_sequence_mermaid.svg
index bccc74c7..0ebc51b3 100644
--- a/docs/test_cases/t20028_sequence_mermaid.svg
+++ b/docs/test_cases/t20028_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 467" style="max-width: 450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 467" style="max-width: 450px; background-color: white;" width="450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="381" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="413.5" x="275">
diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md
index a752cfec..9192f426 100644
--- a/docs/test_cases/t20029.md
+++ b/docs/test_cases/t20029.md
@@ -107,7 +107,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index 7d01b14d..15f99760 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.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="508px" preserveAspectRatio="none" style="width:1017px;height:508px;" version="1.1" viewBox="0 0 1017 508" width="1017px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k9bb0mbzwjcr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1bcxbhr76fvfd" 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"/>
@@ -9,60 +9,60 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="249" x2="249" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="498" x2="498" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="698" x2="698" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="879" x2="879" y1="38.2969" y2="468.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="487.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="487.4873">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="487.4873">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="487.4873">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f1k9bb0mbzwjcr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1bcxbhr76fvfd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="487.4873">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1k9bb0mbzwjcr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1bcxbhr76fvfd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,65.4297,691,69.4297,681,73.4297,685,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="687" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="78" y="64.3638">connect()</text>
@@ -73,21 +73,21 @@
     <path d="M23,138.5625 L87,138.5625 L87,145.5625 L77,155.5625 L23,155.5625 L23,138.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="151.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="232,172.8281,242,176.8281,232,180.8281,236,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="238" y1="176.8281" y2="176.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="171.7622">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="84" y="171.7622">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="215" y="171.7622">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="301" y1="200.9609" y2="200.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="301" y1="200.9609" y2="213.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="260" x2="301" y1="213.9609" y2="213.9609"/>
       <polygon fill="#A80036" points="270,209.9609,260,213.9609,270,217.9609,266,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="266" y="195.895">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="862,228.9609,872,232.9609,862,236.9609,866,232.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="259" x2="868" y1="232.9609" y2="232.9609"/>
     </a>
@@ -97,7 +97,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="301" y1="265.9609" y2="278.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="254" x2="301" y1="278.9609" y2="278.9609"/>
     <polygon fill="#A80036" points="264,274.9609,254,278.9609,264,282.9609,260,278.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="481,299.0938,491,303.0938,481,307.0938,485,303.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="487" y1="303.0938" y2="303.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="261" y="298.0278">send(std::string &amp;&amp;)</text>
@@ -108,7 +108,7 @@
     <path d="M389,342.2266 L453,342.2266 L453,349.2266 L443,359.2266 L389,359.2266 L389,342.2266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="404" y="355.2935">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,376.4922,691,380.4922,681,384.4922,685,380.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="503" x2="687" y1="380.4922" y2="380.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="510" y="375.4263">[</text>
diff --git a/docs/test_cases/t20029_sequence_mermaid.svg b/docs/test_cases/t20029_sequence_mermaid.svg
index 1770faf7..3eefa41d 100644
--- a/docs/test_cases/t20029_sequence_mermaid.svg
+++ b/docs/test_cases/t20029_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1265 673" style="max-width: 1265px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1265 673" style="max-width: 1265px; background-color: white;" width="1265" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="201" stroke="#666" fill="#eaeaea" y="587" x="964"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="619.5" x="1064.5">
diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md
index 7a6c45ee..74e11bfe 100644
--- a/docs/test_cases/t20030.md
+++ b/docs/test_cases/t20030.md
@@ -81,7 +81,7 @@ int tmain(bool f, int a)
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg
index 965125e2..ef20329d 100644
--- a/docs/test_cases/t20030_sequence.svg
+++ b/docs/test_cases/t20030_sequence.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="777px" preserveAspectRatio="none" style="width:427px;height:777px;" version="1.1" viewBox="0 0 427 777" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="femaong61d43x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nt4j10ucc8bj" 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"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="193" x2="193" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="361" x2="361" y1="38.2969" y2="736.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="755.8857">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="755.8857">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="755.8857">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#femaong61d43x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1nt4j10ucc8bj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="755.8857">tmain(bool,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#femaong61d43x)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1nt4j10ucc8bj)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="65.5,64.2969,55.5,68.2969,65.5,72.2969,61.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="59.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,93.4297,186.5,97.4297,176.5,101.4297,180.5,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="97.4297" y2="97.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="61.5" y="92.3638">A(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,152.5625,186.5,156.5625,176.5,160.5625,180.5,156.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="156.5625" y2="156.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="61.5" y="151.4966">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="185.6953" y2="185.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="185.6953" y2="198.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="198.6953" y2="198.6953"/>
@@ -92,36 +92,36 @@
     </a>
     <polygon fill="#A80036" points="60.5,238.6953,50.5,242.6953,60.5,246.6953,56.5,242.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="192.5" y1="242.6953" y2="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,267.8281,199.5,271.8281,209.5,275.8281,205.5,271.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="271.8281" y2="271.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="266.7622">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="300.9609" y2="300.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="300.9609" y2="313.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="313.9609" y2="313.9609"/>
       <polygon fill="#A80036" points="214.5,309.9609,204.5,313.9609,214.5,317.9609,210.5,313.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="295.895">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,369.0938,199.5,373.0938,209.5,377.0938,205.5,373.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="373.0938" y2="373.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="368.0278">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="402.2266" y2="402.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="402.2266" y2="415.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="415.2266" y2="415.2266"/>
       <polygon fill="#A80036" points="214.5,411.2266,204.5,415.2266,214.5,419.2266,210.5,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="397.1606">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,470.3594,199.5,474.3594,209.5,478.3594,205.5,474.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="474.3594" y2="474.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="215.5" y="469.2935">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="503.4922" y2="503.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="503.4922" y2="516.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="516.4922" y2="516.4922"/>
@@ -130,12 +130,12 @@
     </a>
     <polygon fill="#A80036" points="344.5,556.4922,354.5,560.4922,344.5,564.4922,348.5,560.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="560.4922" y2="560.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,585.625,199.5,589.625,209.5,593.625,205.5,589.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="589.625" y2="589.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="215.5" y="584.5591">operator=(const A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="618.7578" y2="618.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="618.7578" y2="631.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="631.7578" y2="631.7578"/>
@@ -144,7 +144,7 @@
     </a>
     <polygon fill="#A80036" points="344.5,671.7578,354.5,675.7578,344.5,679.7578,348.5,675.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="675.7578" y2="675.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,700.8906,199.5,704.8906,209.5,708.8906,205.5,704.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="704.8906" y2="704.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="215.5" y="699.8247">value() const</text>
diff --git a/docs/test_cases/t20030_sequence_mermaid.svg b/docs/test_cases/t20030_sequence_mermaid.svg
index 42b85e10..13ec0fcc 100644
--- a/docs/test_cases/t20030_sequence_mermaid.svg
+++ b/docs/test_cases/t20030_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 857 933" style="max-width: 857px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 857 933" style="max-width: 857px; background-color: white;" width="857" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="847" x="607"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="879.5" x="682">
diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md
index 1f44c5c6..b966014d 100644
--- a/docs/test_cases/t20031.md
+++ b/docs/test_cases/t20031.md
@@ -97,7 +97,7 @@ int tmain(bool f, int a)
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg
index 94405af3..0b5e1ca3 100644
--- a/docs/test_cases/t20031_sequence.svg
+++ b/docs/test_cases/t20031_sequence.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="197px" preserveAspectRatio="none" style="width:578px;height:197px;" version="1.1" viewBox="0 0 578 197" width="578px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1tepkfy5ku6yn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1411syzb96e0f" 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"/>
@@ -9,64 +9,64 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="420" x2="420" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="557" x2="557" y1="38.2969" y2="157.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="176.4248">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="176.4248">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="176.4248">tmain(bool,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="22.9951">execute(std::function&lt;int ()&gt;)</text>
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="176.4248">execute(std::function&lt;int ()&gt;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1tepkfy5ku6yn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1411syzb96e0f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="176.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tepkfy5ku6yn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1411syzb96e0f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="60.5,64.2969,50.5,68.2969,60.5,72.2969,56.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="403.5,78.2969,413.5,82.2969,403.5,86.2969,407.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="409.5" y1="82.2969" y2="82.2969"/>
     </a>
     <polygon fill="#A80036" points="254.5,92.2969,244.5,96.2969,254.5,100.2969,250.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248.5" x2="419.5" y1="96.2969" y2="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="540.5,121.4297,550.5,125.4297,540.5,129.4297,544.5,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="546.5" y1="125.4297" y2="125.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="250.5" y="120.3638">value() const</text>
diff --git a/docs/test_cases/t20031_sequence_mermaid.svg b/docs/test_cases/t20031_sequence_mermaid.svg
index 481ab8ce..c6200e3a 100644
--- a/docs/test_cases/t20031_sequence_mermaid.svg
+++ b/docs/test_cases/t20031_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1110 267" style="max-width: 1110px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1110 267" style="max-width: 1110px; background-color: white;" width="1110" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="181" x="860"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="213.5" x="935">
diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md
index f68ef59a..6618d7f5 100644
--- a/docs/test_cases/t20032.md
+++ b/docs/test_cases/t20032.md
@@ -57,7 +57,7 @@ void tmain(int argc, char **argv)
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg
index 4b33839c..69e11ce3 100644
--- a/docs/test_cases/t20032_sequence.svg
+++ b/docs/test_cases/t20032_sequence.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="448px" preserveAspectRatio="none" style="width:354px;height:448px;" version="1.1" viewBox="0 0 354 448" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flvc3stkii88r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fb7952kf384ox" 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"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="407.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="426.8857">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="426.8857">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#flvc3stkii88r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fb7952kf384ox)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="426.8857">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#flvc3stkii88r)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fb7952kf384ox)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -60,12 +60,12 @@
     <polygon fill="#A80036" points="91.5,152.8281,81.5,156.8281,91.5,160.8281,87.5,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="156.8281" y2="156.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="97.5" y="151.7622">int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,181.9609,193.5,185.9609,183.5,189.9609,187.5,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="180.895">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,211.0938,326.5,215.0938,316.5,219.0938,320.5,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="210.0278">a2(double)</text>
@@ -76,12 +76,12 @@
     <polygon fill="#A80036" points="91.5,269.3594,81.5,273.3594,91.5,277.3594,87.5,273.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="273.3594" y2="273.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="97.5" y="268.2935">double</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,298.4922,193.5,302.4922,183.5,306.4922,187.5,302.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="302.4922" y2="302.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="297.4263">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,327.625,326.5,331.625,316.5,335.625,320.5,331.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="331.625" y2="331.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="326.5591">a3(const char *)</text>
diff --git a/docs/test_cases/t20032_sequence_mermaid.svg b/docs/test_cases/t20032_sequence_mermaid.svg
index 31dd5e89..86fd4f5a 100644
--- a/docs/test_cases/t20032_sequence_mermaid.svg
+++ b/docs/test_cases/t20032_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 711" style="max-width: 650px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 650 711" style="max-width: 650px; background-color: white;" width="650" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="625" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="657.5" x="475">
diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md
index b1c0bf36..2604f6df 100644
--- a/docs/test_cases/t20033.md
+++ b/docs/test_cases/t20033.md
@@ -95,7 +95,7 @@ int tmain()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg
index 9bd688b8..79d2a95c 100644
--- a/docs/test_cases/t20033_sequence.svg
+++ b/docs/test_cases/t20033_sequence.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="1055px" preserveAspectRatio="none" style="width:340px;height:1055px;" version="1.1" viewBox="0 0 340 1055" width="340px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhal8hwd3rnj3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15jhzttjtemih" 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"/>
@@ -9,73 +9,73 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="72.4297"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="130.3672"/>
     <rect fill="#FFFFFF" height="144.2031" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="188.3047"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="332.5078"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="159" x="13" y="921.5"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="1014.7656"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="122.5" x2="122.5" y1="38.2969" y2="1014.7656"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhal8hwd3rnj3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15jhzttjtemih)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fhal8hwd3rnj3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#f15jhzttjtemih)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="1033.7607">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhal8hwd3rnj3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15jhzttjtemih)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fhal8hwd3rnj3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#f15jhzttjtemih)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="1033.7607">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#fhal8hwd3rnj3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f15jhzttjtemih)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="42" x="92" y="67.5073">[false]</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="73.4297" y2="73.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="310" x="18" y="83.6401">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,104.3672,116,108.3672,106,112.3672,110,108.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="108.3672" y2="108.3672"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="103.3013">a1()</text>
@@ -84,7 +84,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="122.3672" y2="122.3672"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="131.3672" y2="131.3672"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="302" x="18" y="141.5776">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,162.3047,116,166.3047,106,170.3047,110,166.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="166.3047" y2="166.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="161.2388">a2()</text>
@@ -93,7 +93,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="180.3047" y2="180.3047"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="189.3047" y2="189.3047"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="182" x="18" y="199.5151">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,220.2422,116,224.2422,106,228.2422,110,224.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="224.2422" y2="224.2422"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="219.1763">[</text>
@@ -102,7 +102,7 @@
     </a>
     <polygon fill="#A80036" points="72,234.2422,62,238.2422,72,242.2422,68,238.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="238.2422" y2="238.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,263.375,116,267.375,106,271.375,110,267.375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="267.375" y2="267.375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="262.3091">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="72,277.375,62,281.375,72,285.375,68,281.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="281.375" y2="281.375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,306.5078,116,310.5078,106,314.5078,110,310.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="310.5078" y2="310.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="305.4419">a3()</text>
@@ -119,7 +119,7 @@
     <polygon fill="#A80036" points="72,320.5078,62,324.5078,72,328.5078,68,324.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="324.5078" y2="324.5078"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="333.5078" y2="333.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,351.6406,116,355.6406,106,359.6406,110,355.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="355.6406" y2="355.6406"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="350.5747">a4()</text>
@@ -130,7 +130,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="404.7075">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="92" y="403.8511">[int i = a.a2(); i != 2]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,425.9063,116,429.9063,106,433.9063,110,429.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="429.9063" y2="429.9063"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="424.8403">[</text>
@@ -139,7 +139,7 @@
     </a>
     <polygon fill="#A80036" points="72,439.9063,62,443.9063,72,447.9063,68,443.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="443.9063" y2="443.9063"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,469.0391,116,473.0391,106,477.0391,110,473.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="473.0391" y2="473.0391"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="467.9731">a3()</text>
@@ -150,7 +150,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="522.106">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="157" x="105" y="521.2495">[int i = 0; i &lt; a.a2(); i++]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,543.3047,116,547.3047,106,551.3047,110,547.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="547.3047" y2="547.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="542.2388">[</text>
@@ -159,14 +159,14 @@
     </a>
     <polygon fill="#A80036" points="72,557.3047,62,561.3047,72,565.3047,68,561.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="561.3047" y2="561.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,586.4375,116,590.4375,106,594.4375,110,590.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="590.4375" y2="590.4375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="585.3716">a3()</text>
     </a>
     <polygon fill="#A80036" points="72,600.4375,62,604.4375,72,608.4375,68,604.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="604.4375" y2="604.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,636.5703,116,640.5703,106,644.5703,110,640.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="640.5703" y2="640.5703"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="635.5044">a3()</text>
@@ -177,7 +177,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="682.6372">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="92" x="105" y="681.7808">[retry_count--]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,703.8359,116,707.8359,106,711.8359,110,707.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="707.8359" y2="707.8359"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="702.77">a2()</text>
@@ -188,14 +188,14 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="756.9028">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="155" x="105" y="756.0464">[retry_count++ &lt; a.a3()]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,778.1016,116,782.1016,106,786.1016,110,782.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="782.1016" y2="782.1016"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="777.0356">a4()</text>
     </a>
     <polygon fill="#A80036" points="72,792.1016,62,796.1016,72,800.1016,68,796.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="796.1016" y2="796.1016"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,821.2344,116,825.2344,106,829.2344,110,825.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="825.2344" y2="825.2344"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="820.1685">[</text>
@@ -208,7 +208,7 @@
     <rect fill="none" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="874.3013">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="75" x="92" y="873.4448">[a.a4() % 6]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,895.5,116,899.5,106,903.5,110,899.5" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="899.5" y2="899.5"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="894.4341">[</text>
@@ -222,7 +222,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="950.5669">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="105" y="949.7104">[ints]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,971.7656,116,975.7656,106,979.7656,110,975.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="975.7656" y2="975.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="970.6997">a4()</text>
diff --git a/docs/test_cases/t20033_sequence_mermaid.svg b/docs/test_cases/t20033_sequence_mermaid.svg
index 0eb7a5c5..95d14083 100644
--- a/docs/test_cases/t20033_sequence_mermaid.svg
+++ b/docs/test_cases/t20033_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 1824" style="max-width: 450px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 450 1824" style="max-width: 450px; background-color: white;" width="450" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="1738" x="200"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1770.5" x="275">
diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md
index 5ab64a79..b202689b 100644
--- a/docs/test_cases/t20034.md
+++ b/docs/test_cases/t20034.md
@@ -101,7 +101,7 @@ void B::b4()
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg
index 933e690d..10e1258a 100644
--- a/docs/test_cases/t20034_sequence.svg
+++ b/docs/test_cases/t20034_sequence.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="934px" preserveAspectRatio="none" style="width:620px;height:934px;" version="1.1" viewBox="0 0 620 934" width="620px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1y2nmeb4ahh3x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fq8p7nrefbxj9" 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"/>
@@ -14,154 +14,154 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="152" x2="152" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="414.5" x2="414.5" y1="38.2969" y2="894.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="913.3467">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="913.3467">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="913.3467">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="913.3467">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda ../../tests/t20034/t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda ../../tests/t20034/t20034.cc:56:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="225.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda ../../tests/t20034/t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda ../../tests/t20034/t20034.cc:56:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="225.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="360" x="232.5" y="22.9951">D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18)</text>
-      <rect fill="#FEFECE" filter="url(#f1y2nmeb4ahh3x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="225.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fq8p7nrefbxj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="225.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="360" x="232.5" y="913.3467">D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18)</text>
     </a>
     <polygon fill="#A80036" points="41,65.4297,51,69.4297,41,73.4297,45,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="64.3638">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="93.4966">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,152.8281,200,156.8281,190,160.8281,194,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="151.7622">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1y2nmeb4ahh3x)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="177.8281"/>
+    <rect fill="#EEEEEE" filter="url(#fq8p7nrefbxj9)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="177.8281" y2="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="180.8281" y2="180.8281"/>
     <polygon fill="#A80036" points="41,209.9609,51,213.9609,41,217.9609,45,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="213.9609" y2="213.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="208.895">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,239.0938,200,243.0938,190,247.0938,194,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="196" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="60" y="238.0278">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1y2nmeb4ahh3x)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="264.0938"/>
+    <rect fill="#EEEEEE" filter="url(#fq8p7nrefbxj9)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="264.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="264.0938" y2="264.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="267.0938" y2="267.0938"/>
     <polygon fill="#A80036" points="41,296.2266,51,300.2266,41,304.2266,45,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="300.2266" y2="300.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="295.1606">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="402.5,325.3594,412.5,329.3594,402.5,333.3594,406.5,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="408.5" y1="329.3594" y2="329.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="60" y="324.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,354.4922,203,358.4922,213,362.4922,209,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="207" x2="413.5" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="219" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1y2nmeb4ahh3x)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#fq8p7nrefbxj9)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="41,411.625,51,415.625,41,419.625,45,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="410.5591">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="439.6919">c4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="194" y1="503.0234" y2="503.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="194" y1="503.0234" y2="516.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="153" x2="194" y1="516.0234" y2="516.0234"/>
       <polygon fill="#A80036" points="163,512.0234,153,516.0234,163,520.0234,159,516.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="497.9575">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,541.1563,200,545.1563,190,549.1563,194,545.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="545.1563" y2="545.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="540.0903">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1y2nmeb4ahh3x)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="566.1563"/>
+    <rect fill="#EEEEEE" filter="url(#fq8p7nrefbxj9)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="566.1563" y2="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="569.1563" y2="569.1563"/>
     <polygon fill="#A80036" points="41,598.2891,51,602.2891,41,606.2891,45,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="602.2891" y2="602.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="597.2231">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,627.4219,100,631.4219,90,635.4219,94,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="626.356">c1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,656.5547,150,660.5547,140,664.5547,144,660.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="660.5547" y2="660.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="655.4888">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,685.6875,200,689.6875,190,693.6875,194,689.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="689.6875" y2="689.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="684.6216">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1y2nmeb4ahh3x)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="710.6875"/>
+    <rect fill="#EEEEEE" filter="url(#fq8p7nrefbxj9)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="605.5" x="3" y="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="710.6875" y2="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="608.5" y1="713.6875" y2="713.6875"/>
     <polygon fill="#A80036" points="41,742.8203,51,746.8203,41,750.8203,45,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="746.8203" y2="746.8203"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="741.7544">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,771.9531,100,775.9531,90,779.9531,94,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="770.8872">c3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="144" y1="805.0859" y2="805.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="144" x2="144" y1="805.0859" y2="818.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="103" x2="144" y1="818.0859" y2="818.0859"/>
       <polygon fill="#A80036" points="113,814.0859,103,818.0859,113,822.0859,109,818.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="109" y="800.02">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,843.2188,150,847.2188,140,851.2188,144,847.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="847.2188" y2="847.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="842.1528">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,872.3516,200,876.3516,190,880.3516,194,876.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="876.3516" y2="876.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="871.2856">a2()</text>
diff --git a/docs/test_cases/t20034_sequence_mermaid.svg b/docs/test_cases/t20034_sequence_mermaid.svg
index 6dca9ae3..d10b6c93 100644
--- a/docs/test_cases/t20034_sequence_mermaid.svg
+++ b/docs/test_cases/t20034_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1448 1289" style="max-width: 1448px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1448 1289" style="max-width: 1448px; background-color: white;" width="1448" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="348" stroke="#666" fill="#eaeaea" y="1203" x="1000"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1235.5" x="1174">
diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md
index 1b60a073..9a210be0 100644
--- a/docs/test_cases/t20035.md
+++ b/docs/test_cases/t20035.md
@@ -44,7 +44,7 @@ int tmain(int argc, char **argv) { return a(argc); }
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg
index 544c821b..bf85f19d 100644
--- a/docs/test_cases/t20035_sequence.svg
+++ b/docs/test_cases/t20035_sequence.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="140px" preserveAspectRatio="none" style="width:349px;height:140px;" version="1.1" viewBox="0 0 349 140" width="349px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1425ncfrlc507" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzew5nbo9f88z" 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"/>
@@ -13,39 +13,39 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="179" x2="179" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="247" x2="247" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="315" x2="315" y1="38.2969" y2="100.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="119.292">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="22.9951">a(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="119.292">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="22.9951">b1(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="119.292">b1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="22.9951">c(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1425ncfrlc507)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzew5nbo9f88z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="119.292">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="167.5,50.2969,177.5,54.2969,167.5,58.2969,171.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="75.5" x2="173.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="235.5,64.2969,245.5,68.2969,235.5,72.2969,239.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="179.5" x2="241.5" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303.5,78.2969,313.5,82.2969,303.5,86.2969,307.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="247.5" x2="309.5" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20035_sequence_mermaid.svg b/docs/test_cases/t20035_sequence_mermaid.svg
index f56672df..dbd1dab4 100644
--- a/docs/test_cases/t20035_sequence_mermaid.svg
+++ b/docs/test_cases/t20035_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 850 201" style="max-width: 850px; background-color: white;" width="850" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="115" x="600"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="147.5" x="675">
diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md
index 74179e91..16515bc4 100644
--- a/docs/test_cases/t20036.md
+++ b/docs/test_cases/t20036.md
@@ -73,7 +73,7 @@ struct D {
 {
   "diagram_type": "sequence",
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg
index f1a32b05..198a3314 100644
--- a/docs/test_cases/t20036_sequence.svg
+++ b/docs/test_cases/t20036_sequence.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="834px" preserveAspectRatio="none" style="width:233px;height:834px;" version="1.1" viewBox="0 0 233 834" width="233px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvbczmi1c48je" width="300%" x="-1" y="-1">
+    <filter height="300%" id="frs9mifaeb9vy" 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"/>
@@ -13,131 +13,131 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="793.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="812.9482">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="812.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="812.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#fvbczmi1c48je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#frs9mifaeb9vy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="812.9482">D</text>
     </a>
     <polygon fill="#A80036" points="40,65.4297,50,69.4297,40,73.4297,44,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="64.3638">c1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="93.4966">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#fvbczmi1c48je)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
+    <rect fill="#EEEEEE" filter="url(#frs9mifaeb9vy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="148.6953" y2="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="151.6953" y2="151.6953"/>
     <polygon fill="#A80036" points="190,180.8281,200,184.8281,190,188.8281,194,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="184.8281" y2="184.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="179.7622">d1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,209.9609,53,213.9609,63,217.9609,59,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="213.9609" y2="213.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="208.895">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,239.0938,100,243.0938,90,247.0938,94,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="238.0278">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,268.2266,150,272.2266,140,276.2266,144,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="272.2266" y2="272.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="267.1606">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#fvbczmi1c48je)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
+    <rect fill="#EEEEEE" filter="url(#frs9mifaeb9vy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="293.2266" y2="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="296.2266" y2="296.2266"/>
     <polygon fill="#A80036" points="190,325.3594,200,329.3594,190,333.3594,194,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="329.3594" y2="329.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="163,354.4922,153,358.4922,163,362.4922,159,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="201" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="169" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#fvbczmi1c48je)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#frs9mifaeb9vy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="40,411.625,50,415.625,40,419.625,44,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="410.5591">c4()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="439.6919">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#fvbczmi1c48je)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
+    <rect fill="#EEEEEE" filter="url(#frs9mifaeb9vy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="494.8906" y2="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="497.8906" y2="497.8906"/>
     <polygon fill="#A80036" points="40,527.0234,50,531.0234,40,535.0234,44,531.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="531.0234" y2="531.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="525.9575">c3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="94" y1="560.1563" y2="560.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="94" y1="560.1563" y2="573.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="94" y1="573.1563" y2="573.1563"/>
       <polygon fill="#A80036" points="63,569.1563,53,573.1563,63,577.1563,59,573.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="59" y="555.0903">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,598.2891,100,602.2891,90,606.2891,94,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="602.2891" y2="602.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="597.2231">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,627.4219,150,631.4219,140,635.4219,144,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="626.356">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#fvbczmi1c48je)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
+    <rect fill="#EEEEEE" filter="url(#frs9mifaeb9vy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="652.4219" y2="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="655.4219" y2="655.4219"/>
     <polygon fill="#A80036" points="190,684.5547,200,688.5547,190,692.5547,194,688.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="688.5547" y2="688.5547"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="683.4888">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,713.6875,53,717.6875,63,721.6875,59,717.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="717.6875" y2="717.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="712.6216">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,742.8203,100,746.8203,90,750.8203,94,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="746.8203" y2="746.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="741.7544">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,771.9531,150,775.9531,140,779.9531,144,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="770.8872">a2()</text>
diff --git a/docs/test_cases/t20036_sequence_mermaid.svg b/docs/test_cases/t20036_sequence_mermaid.svg
index 22edc641..cd661d11 100644
--- a/docs/test_cases/t20036_sequence_mermaid.svg
+++ b/docs/test_cases/t20036_sequence_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 1121" style="max-width: 1050px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 1121" style="max-width: 1050px; background-color: white;" width="1050" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="1035" x="800"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1067.5" x="875">
diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md
index f2faafa3..cfbead57 100644
--- a/docs/test_cases/t30001.md
+++ b/docs/test_cases/t30001.md
@@ -23,6 +23,18 @@ diagrams:
         - 'note right of {{ alias("A::AA::AAA") }}: A AAA note...'
         - '{% set e=element("A::AA") %} note top of {{ alias("A::AA") }} : {{ e.comment.formatted }}'
         - '{% set e=element("B::AA") %} note top of {{ alias("B::AA") }} : {{ e.comment.formatted }}'
+    mermaid:
+      before:
+        - "%% t30001 test diagram of type {{ diagram.type }}"
+      after:
+        - 'N_0001(A AAA note...)'
+        - 'N_0001 -.- {{ alias("A::AA::AAA") }}'
+        - '{% set e=element("A::AA") %}N_0002({{ e.comment.formatted }})'
+        - '{% set e=element("B::AA") %}N_0003({{ e.comment.formatted }})'
+        - 'N_0002 -.- {{ alias("A::AA") }}'
+        - 'N_0003 -.- {{ alias("B::AA") }}'
+
+
 
 ```
 ## Source code
@@ -241,7 +253,7 @@ namespace BB {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 2a1765af..d473ee6c 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="264px" preserveAspectRatio="none" style="width:854px;height:264px;" version="1.1" viewBox="0 0 854 264" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffv4x8u5b4d9n" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1elykrf7rfxe5" 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"/>
@@ -9,63 +9,63 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="63.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="63.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="157.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffv4x8u5b4d9n)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1elykrf7rfxe5)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="157.9951">BB</text>
     </a>
-    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#ffv4x8u5b4d9n)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#f1elykrf7rfxe5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,157 L482,167 L492,167 L482,157 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="174.0669">A AAA note...</text>
-    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#ffv4x8u5b4d9n)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#f1elykrf7rfxe5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,8 L264,18 L274,18 L264,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="25.0669">This is namespace AA in namespace A</text>
-    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#ffv4x8u5b4d9n)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#f1elykrf7rfxe5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,8 L726,18 L736,18 L726,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="25.0669">This is namespace AA in namespace B</text>
     <path d="M313.72,169.5 C337.7,169.5 361.68,169.5 385.66,169.5 " fill="none" id="C_0000274638237740249424-GMN1195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30001_package_mermaid.svg b/docs/test_cases/t30001_package_mermaid.svg
index 852d0490..36542ab3 100644
--- a/docs/test_cases/t30001_package_mermaid.svg
+++ b/docs/test_cases/t30001_package_mermaid.svg
@@ -1 +1,210 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 594.0625 252" style="max-width: 594.062px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(-7.5, -8)" class="root"><g class="clusters"><g id="C_0001931735210112054430" class="cluster clickable flowchart-label"><rect height="236" width="264.03125" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(134.6796875, 8)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(25.5, 35)" class="root"><g class="clusters"><g id="C_0000895913707182089871" class="cluster clickable flowchart-label"><rect height="83" width="214.03125" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(104.34375, 8)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AA</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(66.5078125, 49.5)" title="AAA" id="flowchart-C_0000262162485307734028-4" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AAA</span></div></foreignObject></g></g><g transform="translate(163.5234375, 49.5)" title="BBB" id="flowchart-C_0000018542334992237803-3" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BBB</span></div></foreignObject></g></g></g></g><g transform="translate(140.015625, 192.5)" title="BB" id="flowchart-C_0002230464321696304488-1" class="node default clickable flowchart-label"><rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-10.671875, -9)" style="" class="label"><rect/><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BB</span></div></foreignObject></g></g></g></g><g transform="translate(306.53125, -8)" class="root"><g class="clusters"><g id="C_0001184614645531659789" class="cluster clickable flowchart-label"><rect height="236" width="264.03125" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(134.6796875, 8)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(25.5, 35)" class="root"><g class="clusters"><g id="C_0001528517990989164155" class="cluster clickable flowchart-label"><rect height="83" width="214.03125" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(104.34375, 8)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AA</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(66.5078125, 49.5)" title="AAA" id="flowchart-C_0000274638237740249424-9" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AAA</span></div></foreignObject></g></g><g transform="translate(163.5234375, 49.5)" title="BBB" id="flowchart-C_0002129154382024012563-8" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BBB</span></div></foreignObject></g></g></g></g><g transform="translate(140.015625, 192.5)" title="BB" id="flowchart-C_0000983199564524723281-6" class="node default clickable flowchart-label"><rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-10.671875, -9)" style="" class="label"><rect/><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BB</span></div></foreignObject></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 864.64453125 385" style="max-width: 864.645px; background-color: white;" width="864.64453125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0001931735210112054430" class="cluster clickable flowchart-label">
+          <rect height="286" width="253.359375" y="83" x="62.2890625" ry="0" rx="0" style=""/>
+          <g transform="translate(183.6328125, 83)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001184614645531659789" class="cluster clickable flowchart-label">
+          <rect height="286" width="512.921875" y="83" x="335.72265625" ry="0" rx="0" style=""/>
+          <g transform="translate(586.84765625, 83)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001528517990989164155" class="cluster clickable flowchart-label">
+          <rect height="236" width="386.578125" y="108" x="355.72265625" ry="0" rx="0" style=""/>
+          <g transform="translate(538.33984375, 108)" class="cluster-label">
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0001 LE-C_0000274638237740249424" id="L-N_0001-C_0000274638237740249424-0" d="M404.9765625,33L404.9765625,37.166666666666664C404.9765625,41.333333333333336,404.9765625,49.666666666666664,404.9765625,58C404.9765625,66.33333333333333,404.9765625,74.66666666666667,404.9765625,83C404.9765625,91.33333333333333,404.9765625,99.66666666666667,422.8653998940678,120.75C440.7542372881356,141.83333333333334,476.5319120762712,175.66666666666666,494.420749470339,192.58333333333334L512.3095868644068,209.5"/>
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0002 LE-C_0001528517990989164155" id="L-N_0002-C_0001528517990989164155-0" d="M654.5390625,33L654.5390625,37.166666666666664C654.5390625,41.333333333333336,654.5390625,49.666666666666664,654.5390625,58C654.5390625,66.33333333333333,654.5390625,74.66666666666667,654.5390625,83C654.5390625,91.33333333333333,654.5390625,99.66666666666667,654.5390625,103.83333333333333L654.5390625,108"/>
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0003 LE-C_0000895913707182089871" id="L-N_0003-C_0000895913707182089871-0" d="M145.796875,33L145.796875,37.166666666666664C145.796875,41.333333333333336,145.796875,49.666666666666664,145.796875,58C145.796875,66.33333333333333,145.796875,74.66666666666667,145.796875,83C145.796875,91.33333333333333,145.796875,99.66666666666667,145.796875,108C145.796875,116.33333333333333,145.796875,124.66666666666667,145.796875,128.83333333333334L145.796875,133"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(89.7890625, 125)" class="root">
+          <g class="clusters">
+            <g id="C_0000895913707182089871" class="cluster clickable flowchart-label">
+              <rect height="186" width="97.015625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(45.8359375, 8)" class="cluster-label">
+                <foreignObject height="18" width="21.34375">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">AA</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths"/>
+          <g class="edgeLabels"/>
+          <g class="nodes">
+            <g transform="translate(56.5078125, 59.5)" title="AAA" id="flowchart-C_0000262162485307734028-13" class="node default clickable flowchart-label">
+              <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-16.0078125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="32.015625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">AAA</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(56.5078125, 142.5)" title="BBB" id="flowchart-C_0000018542334992237803-12" class="node default clickable flowchart-label">
+              <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-16.0078125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="32.015625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">BBB</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+        <g transform="translate(262.4765625, 226)" title="BB" id="flowchart-C_0002230464321696304488-10" class="node default clickable flowchart-label">
+          <rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-10.671875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(795.47265625, 226)" title="BB" id="flowchart-C_0000983199564524723281-15" class="node default clickable flowchart-label">
+          <rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-10.671875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(529.7578125, 226)" title="AAA" id="flowchart-C_0000274638237740249424-2" class="node default clickable flowchart-label">
+          <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-16.0078125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="32.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AAA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(683.79296875, 226)" title="BBB" id="flowchart-C_0002129154382024012563-17" class="node default clickable flowchart-label">
+          <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-16.0078125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="32.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BBB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(404.9765625, 16.5)" id="flowchart-N_0001-0" class="node default default flowchart-label">
+          <rect height="33" width="108.40625" y="-16.5" x="-54.203125" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-46.703125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="93.40625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A AAA note...</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(654.5390625, 16.5)" id="flowchart-N_0002-3" class="node default default flowchart-label">
+          <rect height="33" width="290.71875" y="-16.5" x="-145.359375" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-137.859375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="275.71875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is namespace AA in namespace A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(145.796875, 16.5)" id="flowchart-N_0003-4" class="node default default flowchart-label">
+          <rect height="33" width="291.59375" y="-16.5" x="-145.796875" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-138.296875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="276.59375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is namespace AA in namespace B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md
index d696f817..fcf346fa 100644
--- a/docs/test_cases/t30002.md
+++ b/docs/test_cases/t30002.md
@@ -489,7 +489,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 7d3a56da..1ee3f5e4 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:1548px;height:402px;" version="1.1" viewBox="0 0 1548 402" width="1548px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1nq4fc4xymabq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1grijih1w3e16" 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"/>
@@ -9,118 +9,118 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="751" x2="774" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="755" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="775" x2="808" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="779" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1444.5" x2="1478.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="1448.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1368.5" x2="1402.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="1372.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1292.5" x2="1326.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="1296.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1216.5" x2="1250.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="1220.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1140.5" x2="1174.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="1144.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1064.5" x2="1098.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="1068.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="988.5" x2="1022.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="992.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="912.5" x2="946.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="916.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="836.5" x2="870.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="840.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="794.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="754.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.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="668.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.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="582.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.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="496.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.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="450.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="410.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" 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">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" 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">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" 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">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" 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">A18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nq4fc4xymabq)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1grijih1w3e16)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="791" x2="834" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="795" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30002_package_mermaid.svg b/docs/test_cases/t30002_package_mermaid.svg
index 56382431..652965df 100644
--- a/docs/test_cases/t30002_package_mermaid.svg
+++ b/docs/test_cases/t30002_package_mermaid.svg
@@ -1 +1,462 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1677.234375 332" style="max-width: 1677.23px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000145302773464360955" class="cluster clickable flowchart-label"><rect height="133" width="1615.3203125" y="0" x="12.2890625" ry="0" rx="0" style=""/><g transform="translate(814.61328125, 0)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g id="C_0001543480715632256641" class="cluster clickable flowchart-label"><rect height="133" width="1661.234375" y="183" x="0" ry="0" rx="0" style=""/><g transform="translate(825.28125, 183)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g id="C_0001938861639623819235" class="cluster clickable flowchart-label"><rect height="83" width="1575.3203125" y="25" x="32.2890625" ry="0" rx="0" style=""/><g transform="translate(809.27734375, 25)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BB</span></div></foreignObject></g></g><g id="C_0001669745471968085401" class="cluster clickable flowchart-label"><rect height="83" width="1621.234375" y="208" x="20" ry="0" rx="0" style=""/><g transform="translate(819.9453125, 208)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AA</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,208C664.3359375,216.33333333333334,664.3359375,224.66666666666666,664.3359375,228.83333333333334L664.3359375,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,208C748.9140625,216.33333333333334,748.9140625,224.66666666666666,748.9140625,228.83333333333334L748.9140625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,208C72.2890625,216.33333333333334,72.2890625,224.66666666666666,72.2890625,228.83333333333334L72.2890625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,208C156.8671875,216.33333333333334,156.8671875,224.66666666666666,156.8671875,228.83333333333334L156.8671875,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,208C241.4453125,216.33333333333334,241.4453125,224.66666666666666,241.4453125,228.83333333333334L241.4453125,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,208C326.0234375,216.33333333333334,326.0234375,224.66666666666666,326.0234375,228.83333333333334L326.0234375,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,208C1304.09375,216.33333333333334,1304.09375,224.66666666666666,1304.09375,228.83333333333334L1304.09375,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,208C1584.5,216.33333333333334,1584.5,224.66666666666666,1584.5,228.83333333333334L1584.5,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,208C1397.5625,216.33333333333334,1397.5625,224.66666666666666,1397.5625,228.83333333333334L1397.5625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,208C1210.625,216.33333333333334,1210.625,224.66666666666666,1210.625,228.83333333333334L1210.625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,208C410.6015625,216.33333333333334,410.6015625,224.66666666666666,410.6015625,228.83333333333334L410.6015625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,208C579.7578125,216.33333333333334,579.7578125,224.66666666666666,579.7578125,228.83333333333334L579.7578125,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,208C1491.03125,216.33333333333334,1491.03125,224.66666666666666,1491.03125,228.83333333333334L1491.03125,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,208C495.1796875,216.33333333333334,495.1796875,224.66666666666666,495.1796875,228.83333333333334L495.1796875,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,208C837.9375,216.33333333333334,837.9375,224.66666666666666,837.9375,228.83333333333334L837.9375,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,208C930.8125,216.33333333333334,930.8125,224.66666666666666,930.8125,228.83333333333334L930.8125,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,208C1023.6875,216.33333333333334,1023.6875,224.66666666666666,1023.6875,228.83333333333334L1023.6875,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,208C1117.15625,216.33333333333334,1117.15625,224.66666666666666,1117.15625,228.83333333333334L1117.15625,233"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(793.42578125, 66.5)" title="BBB" id="flowchart-C_0002255521339657425355-0" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BBB</span></div></foreignObject></g></g><g transform="translate(72.2890625, 249.5)" title="A1" id="flowchart-C_0001164966689017271053-5" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A1</span></div></foreignObject></g></g><g transform="translate(156.8671875, 249.5)" title="A2" id="flowchart-C_0000695366113361481509-7" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A2</span></div></foreignObject></g></g><g transform="translate(241.4453125, 249.5)" title="A3" id="flowchart-C_0001267709074800873528-9" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A3</span></div></foreignObject></g></g><g transform="translate(326.0234375, 249.5)" title="A4" id="flowchart-C_0000299262817531370604-11" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A4</span></div></foreignObject></g></g><g transform="translate(410.6015625, 249.5)" title="A5" id="flowchart-C_0001207764290216680521-21" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A5</span></div></foreignObject></g></g><g transform="translate(495.1796875, 249.5)" title="A6" id="flowchart-C_0000899091126727901939-27" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A6</span></div></foreignObject></g></g><g transform="translate(579.7578125, 249.5)" title="A7" id="flowchart-C_0000563861734550555261-23" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A7</span></div></foreignObject></g></g><g transform="translate(664.3359375, 249.5)" title="A8" id="flowchart-C_0000839146342143718390-1" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A8</span></div></foreignObject></g></g><g transform="translate(748.9140625, 249.5)" title="A9" id="flowchart-C_0001650835159458422245-3" class="node default clickable flowchart-label"><rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-9.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="19.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A9</span></div></foreignObject></g></g><g transform="translate(837.9375, 249.5)" title="A10" id="flowchart-C_0001453242941322376182-29" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A10</span></div></foreignObject></g></g><g transform="translate(930.8125, 249.5)" title="A11" id="flowchart-C_0000384833776371876986-31" class="node default clickable flowchart-label"><rect height="33" width="42.28125" y="-16.5" x="-21.140625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.640625, -9)" style="" class="label"><rect/><foreignObject height="18" width="27.28125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A11</span></div></foreignObject></g></g><g transform="translate(1023.6875, 249.5)" title="A12" id="flowchart-C_0001199527037490355138-33" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A12</span></div></foreignObject></g></g><g transform="translate(1117.15625, 249.5)" title="A13" id="flowchart-C_0000620689743711615190-35" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A13</span></div></foreignObject></g></g><g transform="translate(1210.625, 249.5)" title="A14" id="flowchart-C_0000301858476377711436-19" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A14</span></div></foreignObject></g></g><g transform="translate(1304.09375, 249.5)" title="A15" id="flowchart-C_0000561239706327729436-13" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A15</span></div></foreignObject></g></g><g transform="translate(1397.5625, 249.5)" title="A16" id="flowchart-C_0001415398383158410524-17" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A16</span></div></foreignObject></g></g><g transform="translate(1491.03125, 249.5)" title="A17" id="flowchart-C_0000532437874530119999-25" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A17</span></div></foreignObject></g></g><g transform="translate(1584.5, 249.5)" title="A18" id="flowchart-C_0000405712335116487393-15" class="node default clickable flowchart-label"><rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-14.234375, -9)" style="" class="label"><rect/><foreignObject height="18" width="28.46875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A18</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1677.234375 332" style="max-width: 1677.23px; background-color: white;" width="1677.234375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000145302773464360955" class="cluster clickable flowchart-label">
+          <rect height="133" width="1615.3203125" y="0" x="12.2890625" ry="0" rx="0" style=""/>
+          <g transform="translate(814.61328125, 0)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001543480715632256641" class="cluster clickable flowchart-label">
+          <rect height="133" width="1661.234375" y="183" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(825.28125, 183)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001938861639623819235" class="cluster clickable flowchart-label">
+          <rect height="83" width="1575.3203125" y="25" x="32.2890625" ry="0" rx="0" style=""/>
+          <g transform="translate(809.27734375, 25)" class="cluster-label">
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001669745471968085401" class="cluster clickable flowchart-label">
+          <rect height="83" width="1621.234375" y="208" x="20" ry="0" rx="0" style=""/>
+          <g transform="translate(819.9453125, 208)" class="cluster-label">
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,208C664.3359375,216.33333333333334,664.3359375,224.66666666666666,664.3359375,228.83333333333334L664.3359375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,208C748.9140625,216.33333333333334,748.9140625,224.66666666666666,748.9140625,228.83333333333334L748.9140625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,208C72.2890625,216.33333333333334,72.2890625,224.66666666666666,72.2890625,228.83333333333334L72.2890625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,208C156.8671875,216.33333333333334,156.8671875,224.66666666666666,156.8671875,228.83333333333334L156.8671875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,208C241.4453125,216.33333333333334,241.4453125,224.66666666666666,241.4453125,228.83333333333334L241.4453125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,208C326.0234375,216.33333333333334,326.0234375,224.66666666666666,326.0234375,228.83333333333334L326.0234375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,208C1304.09375,216.33333333333334,1304.09375,224.66666666666666,1304.09375,228.83333333333334L1304.09375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,208C1584.5,216.33333333333334,1584.5,224.66666666666666,1584.5,228.83333333333334L1584.5,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,208C1397.5625,216.33333333333334,1397.5625,224.66666666666666,1397.5625,228.83333333333334L1397.5625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,208C1210.625,216.33333333333334,1210.625,224.66666666666666,1210.625,228.83333333333334L1210.625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,208C410.6015625,216.33333333333334,410.6015625,224.66666666666666,410.6015625,228.83333333333334L410.6015625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,208C579.7578125,216.33333333333334,579.7578125,224.66666666666666,579.7578125,228.83333333333334L579.7578125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,208C1491.03125,216.33333333333334,1491.03125,224.66666666666666,1491.03125,228.83333333333334L1491.03125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,208C495.1796875,216.33333333333334,495.1796875,224.66666666666666,495.1796875,228.83333333333334L495.1796875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,208C837.9375,216.33333333333334,837.9375,224.66666666666666,837.9375,228.83333333333334L837.9375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,208C930.8125,216.33333333333334,930.8125,224.66666666666666,930.8125,228.83333333333334L930.8125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,208C1023.6875,216.33333333333334,1023.6875,224.66666666666666,1023.6875,228.83333333333334L1023.6875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,208C1117.15625,216.33333333333334,1117.15625,224.66666666666666,1117.15625,228.83333333333334L1117.15625,233"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(793.42578125, 66.5)" title="BBB" id="flowchart-C_0002255521339657425355-0" class="node default clickable flowchart-label">
+          <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-16.0078125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="32.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BBB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(72.2890625, 249.5)" title="A1" id="flowchart-C_0001164966689017271053-5" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(156.8671875, 249.5)" title="A2" id="flowchart-C_0000695366113361481509-7" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(241.4453125, 249.5)" title="A3" id="flowchart-C_0001267709074800873528-9" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(326.0234375, 249.5)" title="A4" id="flowchart-C_0000299262817531370604-11" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A4</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(410.6015625, 249.5)" title="A5" id="flowchart-C_0001207764290216680521-21" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A5</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(495.1796875, 249.5)" title="A6" id="flowchart-C_0000899091126727901939-27" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A6</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(579.7578125, 249.5)" title="A7" id="flowchart-C_0000563861734550555261-23" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A7</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(664.3359375, 249.5)" title="A8" id="flowchart-C_0000839146342143718390-1" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A8</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(748.9140625, 249.5)" title="A9" id="flowchart-C_0001650835159458422245-3" class="node default clickable flowchart-label">
+          <rect height="33" width="34.578125" y="-16.5" x="-17.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-9.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="19.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A9</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(837.9375, 249.5)" title="A10" id="flowchart-C_0001453242941322376182-29" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A10</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(930.8125, 249.5)" title="A11" id="flowchart-C_0000384833776371876986-31" class="node default clickable flowchart-label">
+          <rect height="33" width="42.28125" y="-16.5" x="-21.140625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-13.640625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="27.28125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A11</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1023.6875, 249.5)" title="A12" id="flowchart-C_0001199527037490355138-33" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A12</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1117.15625, 249.5)" title="A13" id="flowchart-C_0000620689743711615190-35" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A13</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1210.625, 249.5)" title="A14" id="flowchart-C_0000301858476377711436-19" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A14</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1304.09375, 249.5)" title="A15" id="flowchart-C_0000561239706327729436-13" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A15</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1397.5625, 249.5)" title="A16" id="flowchart-C_0001415398383158410524-17" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A16</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1491.03125, 249.5)" title="A17" id="flowchart-C_0000532437874530119999-25" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A17</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1584.5, 249.5)" title="A18" id="flowchart-C_0000405712335116487393-15" class="node default clickable flowchart-label">
+          <rect height="33" width="43.46875" y="-16.5" x="-21.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-14.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="28.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A18</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md
index babd591e..e0bc016d 100644
--- a/docs/test_cases/t30003.md
+++ b/docs/test_cases/t30003.md
@@ -171,7 +171,7 @@ class B : public ns1::ns2::Anon { };
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index 79b28858..ef8c3bd3 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="392px" preserveAspectRatio="none" style="width:343px;height:392px;" version="1.1" viewBox="0 0 343 392" width="343px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1b6o1o8zoh0ce" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1g0c8vg91az6u" 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"/>
@@ -9,35 +9,35 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="298.2969" y2="298.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="290.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="217" y1="54.5769" y2="54.5769"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="179" y="47.2751">ns3</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="69.572">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="130.2969" y2="130.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="122.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="325.9951">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="325.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="348.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1b6o1o8zoh0ce)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1g0c8vg91az6u)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="157.9951">ns2</text>
     </a>
diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg
index 673e9942..417d2e5b 100644
--- a/docs/test_cases/t30003_package_mermaid.svg
+++ b/docs/test_cases/t30003_package_mermaid.svg
@@ -1 +1,113 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 308.984375 222" style="max-width: 308.984px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(-7.5, -8)" class="root"><g class="clusters"><g id="C_0000600452871069546589" class="cluster default flowchart-label"><rect height="206" width="292.984375" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(141.59375, 8)" class="cluster-label"><foreignObject height="18" width="25.796875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">ns1</span></div></foreignObject></g></g><g id="C_0000427104404739526818" class="cluster clickable flowchart-label"><rect height="123" width="90.796875" y="28" x="33" ry="0" rx="0" style=""/><g transform="translate(65.5, 28)" class="cluster-label"><foreignObject height="18" width="25.796875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">ns3</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,148.796875,79.5C157.13020833333334,79.5,165.46354166666666,79.5,169.63020833333334,79.5L173.796875,79.5"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000427104404739526818 LE-C_0000820462660523726751" id="L-C_0000427104404739526818-C_0000820462660523726751-0" d="M86.84799947698745,96Z"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(224.890625, 79.5)" title="ns2_v1_0_0" id="flowchart-C_0000647755950450743637-3" class="node default clickable flowchart-label"><rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-43.59375, -9)" style="" class="label"><rect/><foreignObject height="18" width="87.1875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">ns2_v1_0_0</span></div></foreignObject></g></g><g transform="translate(78.3984375, 79.5)" title="ns2" id="flowchart-C_0000820462660523726751-1" class="node default clickable flowchart-label"><rect height="33" width="40.796875" y="-16.5" x="-20.3984375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.8984375, -9)" style="" class="label"><rect/><foreignObject height="18" width="25.796875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">ns2</span></div></foreignObject></g></g><g transform="translate(224.890625, 162.5)" title="ns2_v0_9_0" id="flowchart-C_0001013406647495422406-7" class="node default default flowchart-label"><rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-43.59375, -9)" style="" class="label"><rect/><foreignObject height="18" width="87.1875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">ns2_v0_9_0</span></div></foreignObject></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 308.984375 222" style="max-width: 308.984px; background-color: white;" width="308.984375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0000600452871069546589" class="cluster default flowchart-label">
+              <rect height="206" width="292.984375" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(141.59375, 8)" class="cluster-label">
+                <foreignObject height="18" width="25.796875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">ns1</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g id="C_0000427104404739526818" class="cluster clickable flowchart-label">
+              <rect height="123" width="90.796875" y="28" x="33" ry="0" rx="0" style=""/>
+              <g transform="translate(65.5, 28)" class="cluster-label">
+                <foreignObject height="18" width="25.796875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">ns3</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths">
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,148.796875,79.5C157.13020833333334,79.5,165.46354166666666,79.5,169.63020833333334,79.5L173.796875,79.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000427104404739526818 LE-C_0000820462660523726751" id="L-C_0000427104404739526818-C_0000820462660523726751-0" d="M86.84799947698745,96Z"/>
+          </g>
+          <g class="edgeLabels">
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="nodes">
+            <g transform="translate(224.890625, 79.5)" title="ns2_v1_0_0" id="flowchart-C_0000647755950450743637-3" class="node default clickable flowchart-label">
+              <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-43.59375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="87.1875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">ns2_v1_0_0</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(78.3984375, 79.5)" title="ns2" id="flowchart-C_0000820462660523726751-1" class="node default clickable flowchart-label">
+              <rect height="33" width="40.796875" y="-16.5" x="-20.3984375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-12.8984375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="25.796875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">ns2</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(224.890625, 162.5)" title="ns2_v0_9_0" id="flowchart-C_0001013406647495422406-7" class="node default default flowchart-label">
+              <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-43.59375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="87.1875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">ns2_v0_9_0</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md
index f72e4147..0af2a18d 100644
--- a/docs/test_cases/t30004.md
+++ b/docs/test_cases/t30004.md
@@ -182,7 +182,7 @@ namespace CCC {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 02ca4a35..db7ad8c0 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="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fciucb512bmmc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kwm5rvrf0p3s" 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"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#fciucb512bmmc)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#f1kwm5rvrf0p3s)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,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>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#fciucb512bmmc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1kwm5rvrf0p3s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M325,186 L325,196 L335,196 L325,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="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#fciucb512bmmc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1kwm5rvrf0p3s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M566,73 L566,83 L576,83 L566,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="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#fciucb512bmmc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1kwm5rvrf0p3s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#fciucb512bmmc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1kwm5rvrf0p3s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M335.5,73 L335.5,83 L345.5,83 L335.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="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fciucb512bmmc)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1kwm5rvrf0p3s)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.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="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fciucb512bmmc)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1kwm5rvrf0p3s)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fciucb512bmmc)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1kwm5rvrf0p3s)" 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">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#fciucb512bmmc)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#f1kwm5rvrf0p3s)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.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="374.5" y="186.9951">EEE</text>
     </a>
diff --git a/docs/test_cases/t30004_package_mermaid.svg b/docs/test_cases/t30004_package_mermaid.svg
index 35259c3a..b3da38b3 100644
--- a/docs/test_cases/t30004_package_mermaid.svg
+++ b/docs/test_cases/t30004_package_mermaid.svg
@@ -1 +1,178 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 331.859375 368" style="max-width: 331.859px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(-7.5, -8)" class="root"><g class="clusters"><g id="C_0000033410665874039845" class="cluster clickable flowchart-label"><rect height="352" width="315.859375" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(160.59375, 8)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g></g><g class="edgePaths"><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001517185300862579159" id="L-N_0-C_0001517185300862579159-0" d="M174.7421875,59.5L182.98307291666666,59.5C191.22395833333334,59.5,207.70572916666666,59.5,220.33463541666666,59.5C232.96354166666666,59.5,241.73958333333334,59.5,246.12760416666666,59.5L250.515625,59.5"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_1 LE-C_0001982379087062354928" id="L-N_1-C_0001982379087062354928-0" d="M175.1796875,142.5L183.34765625,142.5C191.515625,142.5,207.8515625,142.5,220.40755208333334,142.5C232.96354166666666,142.5,241.73958333333334,142.5,246.12760416666666,142.5L250.515625,142.5"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_2 LE-C_0002304726195556701567" id="L-N_2-C_0002304726195556701567-0" d="M199.1875,225.5L203.35416666666666,225.5C207.52083333333334,225.5,215.85416666666666,225.5,224.1875,225.5C232.52083333333334,225.5,240.85416666666666,225.5,245.02083333333334,225.5L249.1875,225.5"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_3 LE-C_0001084924732216290779" id="L-N_3-C_0001084924732216290779-0" d="M187.0234375,308.5L193.21744791666666,308.5C199.41145833333334,308.5,211.79947916666666,308.5,222.38151041666666,308.5C232.96354166666666,308.5,241.73958333333334,308.5,246.12760416666666,308.5L250.515625,308.5"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(274.0234375, 59.5)" title="AAA" id="flowchart-C_0001517185300862579159-2" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AAA</span></div></foreignObject></g></g><g transform="translate(116.09375, 59.5)" id="flowchart-N_0-0" class="node default default flowchart-label"><rect height="33" width="117.296875" y="-16.5" x="-58.6484375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-51.1484375, -9)" style="" class="label"><rect/><foreignObject height="18" width="102.296875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">Package AAA.</span></div></foreignObject></g></g><g transform="translate(116.09375, 142.5)" id="flowchart-N_1-3" class="node default default flowchart-label"><rect height="33" width="118.171875" y="-16.5" x="-59.0859375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-51.5859375, -9)" style="" class="label"><rect/><foreignObject height="18" width="103.171875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">Package BBB.</span></div></foreignObject></g></g><g transform="translate(274.0234375, 142.5)" title="BBB" id="flowchart-C_0001982379087062354928-5" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BBB</span></div></foreignObject></g></g><g transform="translate(116.09375, 225.5)" id="flowchart-N_2-6" class="node default default flowchart-label"><rect height="33" width="166.1875" y="-16.5" x="-83.09375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-75.59375, -9)" style="" class="label"><rect/><foreignObject height="18" width="151.1875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">CCCC package note.</span></div></foreignObject></g></g><g transform="translate(274.0234375, 225.5)" title="CCC" id="flowchart-C_0002304726195556701567-8" class="node default clickable flowchart-label"><rect height="33" width="49.671875" y="-16.5" x="-24.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-17.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="34.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">CCC</span></div></foreignObject></g></g><g transform="translate(116.09375, 308.5)" id="flowchart-N_3-9" class="node default default flowchart-label"><rect height="33" width="141.859375" y="-16.5" x="-70.9296875" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-63.4296875, -9)" style="" class="label"><rect/><foreignObject height="18" width="126.859375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">We skipped DDD.</span></div></foreignObject></g></g><g transform="translate(274.0234375, 308.5)" title="EEE" id="flowchart-C_0001084924732216290779-11" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">EEE</span></div></foreignObject></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 331.859375 368" style="max-width: 331.859px; background-color: white;" width="331.859375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0000033410665874039845" class="cluster clickable flowchart-label">
+              <rect height="352" width="315.859375" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(160.59375, 8)" class="cluster-label">
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">A</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths">
+            <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001517185300862579159" id="L-N_0-C_0001517185300862579159-0" d="M174.7421875,59.5L182.98307291666666,59.5C191.22395833333334,59.5,207.70572916666666,59.5,220.33463541666666,59.5C232.96354166666666,59.5,241.73958333333334,59.5,246.12760416666666,59.5L250.515625,59.5"/>
+            <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_1 LE-C_0001982379087062354928" id="L-N_1-C_0001982379087062354928-0" d="M175.1796875,142.5L183.34765625,142.5C191.515625,142.5,207.8515625,142.5,220.40755208333334,142.5C232.96354166666666,142.5,241.73958333333334,142.5,246.12760416666666,142.5L250.515625,142.5"/>
+            <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_2 LE-C_0002304726195556701567" id="L-N_2-C_0002304726195556701567-0" d="M199.1875,225.5L203.35416666666666,225.5C207.52083333333334,225.5,215.85416666666666,225.5,224.1875,225.5C232.52083333333334,225.5,240.85416666666666,225.5,245.02083333333334,225.5L249.1875,225.5"/>
+            <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_3 LE-C_0001084924732216290779" id="L-N_3-C_0001084924732216290779-0" d="M187.0234375,308.5L193.21744791666666,308.5C199.41145833333334,308.5,211.79947916666666,308.5,222.38151041666666,308.5C232.96354166666666,308.5,241.73958333333334,308.5,246.12760416666666,308.5L250.515625,308.5"/>
+          </g>
+          <g class="edgeLabels">
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="nodes">
+            <g transform="translate(274.0234375, 59.5)" title="AAA" id="flowchart-C_0001517185300862579159-2" class="node default clickable flowchart-label">
+              <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-16.0078125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="32.015625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">AAA</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(116.09375, 59.5)" id="flowchart-N_0-0" class="node default default flowchart-label">
+              <rect height="33" width="117.296875" y="-16.5" x="-58.6484375" ry="5" rx="5" style="" class="basic label-container"/>
+              <g transform="translate(-51.1484375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="102.296875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">Package AAA.</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(116.09375, 142.5)" id="flowchart-N_1-3" class="node default default flowchart-label">
+              <rect height="33" width="118.171875" y="-16.5" x="-59.0859375" ry="5" rx="5" style="" class="basic label-container"/>
+              <g transform="translate(-51.5859375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="103.171875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">Package BBB.</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(274.0234375, 142.5)" title="BBB" id="flowchart-C_0001982379087062354928-5" class="node default clickable flowchart-label">
+              <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-16.0078125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="32.015625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">BBB</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(116.09375, 225.5)" id="flowchart-N_2-6" class="node default default flowchart-label">
+              <rect height="33" width="166.1875" y="-16.5" x="-83.09375" ry="5" rx="5" style="" class="basic label-container"/>
+              <g transform="translate(-75.59375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="151.1875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">CCCC package note.</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(274.0234375, 225.5)" title="CCC" id="flowchart-C_0002304726195556701567-8" class="node default clickable flowchart-label">
+              <rect height="33" width="49.671875" y="-16.5" x="-24.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-17.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="34.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">CCC</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(116.09375, 308.5)" id="flowchart-N_3-9" class="node default default flowchart-label">
+              <rect height="33" width="141.859375" y="-16.5" x="-70.9296875" ry="5" rx="5" style="" class="basic label-container"/>
+              <g transform="translate(-63.4296875, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="126.859375">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">We skipped DDD.</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(274.0234375, 308.5)" title="EEE" id="flowchart-C_0001084924732216290779-11" class="node default clickable flowchart-label">
+              <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-16.0078125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="32.015625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">EEE</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md
index c466ed22..bb662edb 100644
--- a/docs/test_cases/t30005.md
+++ b/docs/test_cases/t30005.md
@@ -216,7 +216,7 @@ struct C2 {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index e57b27ff..068615cf 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="f1sqrmza972ts7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fs3ndw88yqpqb" 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"/>
@@ -9,48 +9,48 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sqrmza972ts7)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs3ndw88yqpqb)" 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>
     </a>
diff --git a/docs/test_cases/t30005_package_mermaid.svg b/docs/test_cases/t30005_package_mermaid.svg
index b1188274..f97615b4 100644
--- a/docs/test_cases/t30005_package_mermaid.svg
+++ b/docs/test_cases/t30005_package_mermaid.svg
@@ -1 +1,146 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 352.6875 332" style="max-width: 352.688px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0001041076320925403190" class="cluster clickable flowchart-label"><rect height="133" width="159.671875" y="0" x="177.015625" ry="0" rx="0" style=""/><g transform="translate(251.0703125, 0)" class="cluster-label"><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g><g id="C_0000378529216628023051" class="cluster clickable flowchart-label"><rect height="133" width="157.015625" y="0" x="0" ry="0" rx="0" style=""/><g transform="translate(73.171875, 0)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g id="C_0001768303675686131578" class="cluster clickable flowchart-label"><rect height="133" width="306.8515625" y="183" x="9.25390625" ry="0" rx="0" style=""/><g transform="translate(157.34375, 183)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g id="C_0002134234141727442046" class="cluster clickable flowchart-label"><rect height="83" width="119.671875" y="25" x="197.015625" ry="0" rx="0" style=""/><g transform="translate(245.296875, 25)" class="cluster-label"><foreignObject height="18" width="23.109375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">CC</span></div></foreignObject></g></g><g id="C_0001696631362104244809" class="cluster clickable flowchart-label"><rect height="83" width="117.015625" y="25" x="20" ry="0" rx="0" style=""/><g transform="translate(67.8359375, 25)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BB</span></div></foreignObject></g></g><g id="C_0001777547159021391040" class="cluster clickable flowchart-label"><rect height="83" width="266.8515625" y="208" x="29.25390625" ry="0" rx="0" style=""/><g transform="translate(152.0078125, 208)" class="cluster-label"><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AA</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,89.45182291666667,208.92660329420013C100.39583333333333,218.18653992173356,122.28385416666667,228.37307984346708,133.22786458333334,233.46634980433387L144.171875,238.55961976520064"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,245.90755208333334,208.92660329420013C234.96354166666666,218.18653992173356,213.07552083333334,228.37307984346708,202.13151041666666,233.46634980433387L191.1875,238.55961976520064"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(256.8515625, 66.5)" title="CCC" id="flowchart-C_0001763279540133487999-2" class="node default clickable flowchart-label"><rect height="33" width="49.671875" y="-16.5" x="-24.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-17.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="34.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">CCC</span></div></foreignObject></g></g><g transform="translate(78.5078125, 66.5)" title="BBB" id="flowchart-C_0001871026935460001668-0" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">BBB</span></div></foreignObject></g></g><g transform="translate(167.6796875, 249.5)" title="AAA" id="flowchart-C_0000914090901927655181-1" class="node default clickable flowchart-label"><rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.0078125, -9)" style="" class="label"><rect/><foreignObject height="18" width="32.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AAA</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 352.6875 332" style="max-width: 352.688px; background-color: white;" width="352.6875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0001041076320925403190" class="cluster clickable flowchart-label">
+          <rect height="133" width="159.671875" y="0" x="177.015625" ry="0" rx="0" style=""/>
+          <g transform="translate(251.0703125, 0)" class="cluster-label">
+            <foreignObject height="18" width="11.5625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">C</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0000378529216628023051" class="cluster clickable flowchart-label">
+          <rect height="133" width="157.015625" y="0" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(73.171875, 0)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001768303675686131578" class="cluster clickable flowchart-label">
+          <rect height="133" width="306.8515625" y="183" x="9.25390625" ry="0" rx="0" style=""/>
+          <g transform="translate(157.34375, 183)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0002134234141727442046" class="cluster clickable flowchart-label">
+          <rect height="83" width="119.671875" y="25" x="197.015625" ry="0" rx="0" style=""/>
+          <g transform="translate(245.296875, 25)" class="cluster-label">
+            <foreignObject height="18" width="23.109375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">CC</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001696631362104244809" class="cluster clickable flowchart-label">
+          <rect height="83" width="117.015625" y="25" x="20" ry="0" rx="0" style=""/>
+          <g transform="translate(67.8359375, 25)" class="cluster-label">
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001777547159021391040" class="cluster clickable flowchart-label">
+          <rect height="83" width="266.8515625" y="208" x="29.25390625" ry="0" rx="0" style=""/>
+          <g transform="translate(152.0078125, 208)" class="cluster-label">
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,89.45182291666667,208.92660329420013C100.39583333333333,218.18653992173356,122.28385416666667,228.37307984346708,133.22786458333334,233.46634980433387L144.171875,238.55961976520064"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,245.90755208333334,208.92660329420013C234.96354166666666,218.18653992173356,213.07552083333334,228.37307984346708,202.13151041666666,233.46634980433387L191.1875,238.55961976520064"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(256.8515625, 66.5)" title="CCC" id="flowchart-C_0001763279540133487999-2" class="node default clickable flowchart-label">
+          <rect height="33" width="49.671875" y="-16.5" x="-24.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-17.3359375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="34.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">CCC</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(78.5078125, 66.5)" title="BBB" id="flowchart-C_0001871026935460001668-0" class="node default clickable flowchart-label">
+          <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-16.0078125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="32.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">BBB</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(167.6796875, 249.5)" title="AAA" id="flowchart-C_0000914090901927655181-1" class="node default clickable flowchart-label">
+          <rect height="33" width="47.015625" y="-16.5" x="-23.5078125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-16.0078125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="32.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AAA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md
index aff0dee5..06f98c8d 100644
--- a/docs/test_cases/t30006.md
+++ b/docs/test_cases/t30006.md
@@ -130,7 +130,7 @@ struct A2 {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 8801d95e..e1d4cf01 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:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qhh0c58xwr07" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fad7xrze6lfnv" 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"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qhh0c58xwr07)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad7xrze6lfnv)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qhh0c58xwr07)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad7xrze6lfnv)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.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="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qhh0c58xwr07)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad7xrze6lfnv)" 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>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f1qhh0c58xwr07)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#fad7xrze6lfnv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M91,8 L91,18 L101,18 L91,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="13" y="25.0669">Top A note.</text>
     <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN1318-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30006_package_mermaid.svg b/docs/test_cases/t30006_package_mermaid.svg
index d5456be9..6bc8f006 100644
--- a/docs/test_cases/t30006_package_mermaid.svg
+++ b/docs/test_cases/t30006_package_mermaid.svg
@@ -1 +1,106 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 118.234375 215" style="max-width: 118.234px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001499919423527579699" id="L-N_0-C_0001499919423527579699-0" d="M50.89453125,33L50.89453125,37.166666666666664C50.89453125,41.333333333333336,50.89453125,49.666666666666664,50.89453125,58C50.89453125,66.33333333333333,50.89453125,74.66666666666667,50.89453125,78.83333333333333L50.89453125,83"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,140.58276882548154C12.8359375,149.33333333333334,12.8359375,157.66666666666666,12.8359375,161.83333333333334L12.8359375,166"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,140.58276882548154C88.953125,149.33333333333334,88.953125,157.66666666666666,88.953125,161.83333333333334L88.953125,166"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(50.89453125, 16.5)" id="flowchart-N_0-0" class="node default default flowchart-label"><rect height="33" width="94.1875" y="-16.5" x="-47.09375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-39.59375, -9)" style="" class="label"><rect/><foreignObject height="18" width="79.1875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">Top A note.</span></div></foreignObject></g></g><g transform="translate(50.89453125, 99.5)" title="A" id="flowchart-C_0001499919423527579699-2" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g transform="translate(12.8359375, 182.5)" title="B" id="flowchart-C_0001659090172211944144-4" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g transform="translate(88.953125, 182.5)" title="C" id="flowchart-C_0001380567463986115369-6" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 118.234375 215" style="max-width: 118.234px; background-color: white;" width="118.234375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths">
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001499919423527579699" id="L-N_0-C_0001499919423527579699-0" d="M50.89453125,33L50.89453125,37.166666666666664C50.89453125,41.333333333333336,50.89453125,49.666666666666664,50.89453125,58C50.89453125,66.33333333333333,50.89453125,74.66666666666667,50.89453125,78.83333333333333L50.89453125,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,140.58276882548154C12.8359375,149.33333333333334,12.8359375,157.66666666666666,12.8359375,161.83333333333334L12.8359375,166"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,140.58276882548154C88.953125,149.33333333333334,88.953125,157.66666666666666,88.953125,161.83333333333334L88.953125,166"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(50.89453125, 16.5)" id="flowchart-N_0-0" class="node default default flowchart-label">
+          <rect height="33" width="94.1875" y="-16.5" x="-47.09375" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-39.59375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="79.1875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">Top A note.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(50.89453125, 99.5)" title="A" id="flowchart-C_0001499919423527579699-2" class="node default clickable flowchart-label">
+          <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-5.3359375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(12.8359375, 182.5)" title="B" id="flowchart-C_0001659090172211944144-4" class="node default clickable flowchart-label">
+          <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-5.3359375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(88.953125, 182.5)" title="C" id="flowchart-C_0001380567463986115369-6" class="node default clickable flowchart-label">
+          <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-5.78125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="11.5625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">C</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md
index da096382..89186482 100644
--- a/docs/test_cases/t30007.md
+++ b/docs/test_cases/t30007.md
@@ -153,7 +153,7 @@ struct A2 {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index d6438159..6612bbf6 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:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4gu32yptdj0x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcubzjyd5qvlb" 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"/>
@@ -9,27 +9,27 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4gu32yptdj0x)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fcubzjyd5qvlb)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.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="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4gu32yptdj0x)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fcubzjyd5qvlb)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.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="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4gu32yptdj0x)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fcubzjyd5qvlb)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.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="147.5" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4gu32yptdj0x)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fcubzjyd5qvlb)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
     </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f4gu32yptdj0x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#fcubzjyd5qvlb)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M201,8 L201,18 L211,18 L201,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="12" y="25.0669">Compare layout with t30006.</text>
     <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1330-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package_mermaid.svg b/docs/test_cases/t30007_package_mermaid.svg
index 3f233bd2..bb0c362d 100644
--- a/docs/test_cases/t30007_package_mermaid.svg
+++ b/docs/test_cases/t30007_package_mermaid.svg
@@ -1 +1,117 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 234.671875 265" style="max-width: 234.672px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000870874615388866345" class="cluster clickable flowchart-label"><rect height="83" width="159.2890625" y="83" x="24.69140625" ry="0" rx="0" style=""/><g transform="translate(99, 83)" class="cluster-label"><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,191C71.27734375,199.33333333333334,71.27734375,207.66666666666666,71.27734375,211.83333333333334L71.27734375,216"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,191C147.39453125,199.33333333333334,147.39453125,207.66666666666666,147.39453125,211.83333333333334L147.39453125,216"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0000870874615388866345" id="L-N_0-C_0000870874615388866345-0" d="M109.3359375,33L109.3359375,37.166666666666664C109.3359375,41.333333333333336,109.3359375,49.666666666666664,109.3359375,58C109.3359375,66.33333333333333,109.3359375,74.66666666666667,109.3359375,78.83333333333333L109.3359375,83"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(109.3359375, 124.5)" title="AA" id="flowchart-C_0000357722505818238170-3" class="node default clickable flowchart-label"><rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-10.671875, -9)" style="" class="label"><rect/><foreignObject height="18" width="21.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">AA</span></div></foreignObject></g></g><g transform="translate(109.3359375, 16.5)" id="flowchart-N_0-0" class="node default default flowchart-label"><rect height="33" width="218.671875" y="-16.5" x="-109.3359375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-101.8359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="203.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">Compare layout with t30006.</span></div></foreignObject></g></g><g transform="translate(71.27734375, 232.5)" title="B" id="flowchart-C_0001852704221005355550-4" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g transform="translate(147.39453125, 232.5)" title="C" id="flowchart-C_0000937791537887318363-6" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 234.671875 265" style="max-width: 234.672px; background-color: white;" width="234.671875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000870874615388866345" class="cluster clickable flowchart-label">
+          <rect height="83" width="159.2890625" y="83" x="24.69140625" ry="0" rx="0" style=""/>
+          <g transform="translate(99, 83)" class="cluster-label">
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">A</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,191C71.27734375,199.33333333333334,71.27734375,207.66666666666666,71.27734375,211.83333333333334L71.27734375,216"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,191C147.39453125,199.33333333333334,147.39453125,207.66666666666666,147.39453125,211.83333333333334L147.39453125,216"/>
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0000870874615388866345" id="L-N_0-C_0000870874615388866345-0" d="M109.3359375,33L109.3359375,37.166666666666664C109.3359375,41.333333333333336,109.3359375,49.666666666666664,109.3359375,58C109.3359375,66.33333333333333,109.3359375,74.66666666666667,109.3359375,78.83333333333333L109.3359375,83"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(109.3359375, 124.5)" title="AA" id="flowchart-C_0000357722505818238170-3" class="node default clickable flowchart-label">
+          <rect height="33" width="36.34375" y="-16.5" x="-18.171875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-10.671875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="21.34375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">AA</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(109.3359375, 16.5)" id="flowchart-N_0-0" class="node default default flowchart-label">
+          <rect height="33" width="218.671875" y="-16.5" x="-109.3359375" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-101.8359375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="203.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">Compare layout with t30006.</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(71.27734375, 232.5)" title="B" id="flowchart-C_0001852704221005355550-4" class="node default clickable flowchart-label">
+          <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-5.3359375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="10.671875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">B</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(147.39453125, 232.5)" title="C" id="flowchart-C_0000937791537887318363-6" class="node default clickable flowchart-label">
+          <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-5.78125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="11.5625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">C</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md
index 98045c7f..b9c14fd7 100644
--- a/docs/test_cases/t30008.md
+++ b/docs/test_cases/t30008.md
@@ -213,7 +213,7 @@ struct FF {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index dca2d131..54d031fd 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_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="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcakrx09dk0j1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkz8cczxdpqud" 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"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcakrx09dk0j1)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkz8cczxdpqud)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
     </a>
diff --git a/docs/test_cases/t30008_package_mermaid.svg b/docs/test_cases/t30008_package_mermaid.svg
index 43c5c8f5..6d9fc16a 100644
--- a/docs/test_cases/t30008_package_mermaid.svg
+++ b/docs/test_cases/t30008_package_mermaid.svg
@@ -1 +1,176 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 520.921875 119" style="max-width: 520.922px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(-7.5, -8)" class="root"><g class="clusters"><g id="C_0002103969167872217960" class="cluster clickable flowchart-label"><rect height="103" width="227.015625" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(71.6875, 8)" class="cluster-label"><foreignObject height="18" width="99.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependencies</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,158.453125,59.5C166.78645833333334,59.5,175.11979166666666,59.5,179.28645833333334,59.5L183.453125,59.5"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,82.78125,59.5C91.11458333333333,59.5,99.44791666666667,59.5,103.61458333333333,59.5L107.78125,59.5"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(196.734375, 59.5)" title="D" id="flowchart-C_0000912387297717034254-5" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">D</span></div></foreignObject></g></g><g transform="translate(120.6171875, 59.5)" title="E" id="flowchart-C_0001114997990364518938-4" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">E</span></div></foreignObject></g></g><g transform="translate(45.390625, 59.5)" title="F" id="flowchart-C_0001062827161678172094-6" class="node default clickable flowchart-label"><rect height="33" width="24.78125" y="-16.5" x="-12.390625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-4.890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="9.78125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">F</span></div></foreignObject></g></g></g></g><g transform="translate(269.515625, -8)" class="root"><g class="clusters"><g id="C_0001601960042765615222" class="cluster clickable flowchart-label"><rect height="103" width="227.90625" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(80.1328125, 8)" class="cluster-label"><foreignObject height="18" width="83.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependants</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,160.234375,59.5C168.56770833333334,59.5,176.90104166666666,59.5,181.06770833333334,59.5L185.234375,59.5"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,84.5625,59.5C92.89583333333333,59.5,101.22916666666667,59.5,105.39583333333333,59.5L109.5625,59.5"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(198.0703125, 59.5)" title="A" id="flowchart-C_0002096441629244782012-1" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g transform="translate(122.3984375, 59.5)" title="B" id="flowchart-C_0000500208250168931957-0" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g transform="translate(46.28125, 59.5)" title="C" id="flowchart-C_0001095841247154575825-2" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 520.921875 119" style="max-width: 520.922px; background-color: white;" width="520.921875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0002103969167872217960" class="cluster clickable flowchart-label">
+              <rect height="103" width="227.015625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(71.6875, 8)" class="cluster-label">
+                <foreignObject height="18" width="99.640625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">dependencies</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths">
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,158.453125,59.5C166.78645833333334,59.5,175.11979166666666,59.5,179.28645833333334,59.5L183.453125,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,82.78125,59.5C91.11458333333333,59.5,99.44791666666667,59.5,103.61458333333333,59.5L107.78125,59.5"/>
+          </g>
+          <g class="edgeLabels">
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="nodes">
+            <g transform="translate(196.734375, 59.5)" title="D" id="flowchart-C_0000912387297717034254-5" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">D</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(120.6171875, 59.5)" title="E" id="flowchart-C_0001114997990364518938-4" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">E</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(45.390625, 59.5)" title="F" id="flowchart-C_0001062827161678172094-6" class="node default clickable flowchart-label">
+              <rect height="33" width="24.78125" y="-16.5" x="-12.390625" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-4.890625, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="9.78125">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">F</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+        <g transform="translate(269.515625, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0001601960042765615222" class="cluster clickable flowchart-label">
+              <rect height="103" width="227.90625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(80.1328125, 8)" class="cluster-label">
+                <foreignObject height="18" width="83.640625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">dependants</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths">
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,160.234375,59.5C168.56770833333334,59.5,176.90104166666666,59.5,181.06770833333334,59.5L185.234375,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,84.5625,59.5C92.89583333333333,59.5,101.22916666666667,59.5,105.39583333333333,59.5L109.5625,59.5"/>
+          </g>
+          <g class="edgeLabels">
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g class="edgeLabel">
+              <g transform="translate(0, 0)" class="label">
+                <foreignObject height="0" width="0">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="edgeLabel"/>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="nodes">
+            <g transform="translate(198.0703125, 59.5)" title="A" id="flowchart-C_0002096441629244782012-1" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">A</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(122.3984375, 59.5)" title="B" id="flowchart-C_0000500208250168931957-0" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">B</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 59.5)" title="C" id="flowchart-C_0001095841247154575825-2" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">C</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md
index 1430109c..e0e79408 100644
--- a/docs/test_cases/t30009.md
+++ b/docs/test_cases/t30009.md
@@ -219,7 +219,7 @@ namespace D {
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg
index ea607186..4792de09 100644
--- a/docs/test_cases/t30009_package.svg
+++ b/docs/test_cases/t30009_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="188px" preserveAspectRatio="none" style="width:639px;height:188px;" version="1.1" viewBox="0 0 639 188" width="639px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgztv8qtmubrv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mastdkzyc8el" 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"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="67" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="26" y="38.9951">One</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="332" x2="379" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="336" y="38.9951">Two</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="128" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="109" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="97.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="236.5" x2="260.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="240.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="170.5" x2="194.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="174.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="348.5" x2="372.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="352.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="547" x2="570" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="551" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="480.5" x2="504.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="484.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgztv8qtmubrv)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1mastdkzyc8el)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="414.5" x2="438.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="418.5" y="97.9951">D</text>
     </a>
diff --git a/docs/test_cases/t30009_package_mermaid.svg b/docs/test_cases/t30009_package_mermaid.svg
index f264109b..903c6979 100644
--- a/docs/test_cases/t30009_package_mermaid.svg
+++ b/docs/test_cases/t30009_package_mermaid.svg
@@ -1 +1,154 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 219.125 368" style="max-width: 219.125px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"/><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(-7.5, -8)" class="root"><g class="clusters"><g id="C_0001940839474792549233" class="cluster clickable flowchart-label"><rect height="352" width="76.5625" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(31.609375, 8)" class="cluster-label"><foreignObject height="18" width="29.34375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">Two</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(46.28125, 59.5)" title="A" id="flowchart-C_0000986505573514384282-4" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g transform="translate(46.28125, 142.5)" title="B" id="flowchart-C_0002156827588463114203-3" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g transform="translate(46.28125, 225.5)" title="C" id="flowchart-C_0001653274432960093632-2" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g><g transform="translate(46.28125, 308.5)" title="D" id="flowchart-C_0000263095551354153183-1" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">D</span></div></foreignObject></g></g></g></g><g transform="translate(119.0625, -8)" class="root"><g class="clusters"><g id="C_0001187941209208108244" class="cluster clickable flowchart-label"><rect height="352" width="76.5625" y="8" x="8" ry="0" rx="0" style=""/><g transform="translate(31.15625, 8)" class="cluster-label"><foreignObject height="18" width="30.25"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">One</span></div></foreignObject></g></g></g><g class="edgePaths"/><g class="edgeLabels"/><g class="nodes"><g transform="translate(46.28125, 59.5)" title="B" id="flowchart-C_0000209763670816643341-9" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">B</span></div></foreignObject></g></g><g transform="translate(46.28125, 142.5)" title="D" id="flowchart-C_0001181245940399690936-8" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">D</span></div></foreignObject></g></g><g transform="translate(46.28125, 225.5)" title="A" id="flowchart-C_0001189741240939898414-7" class="node default clickable flowchart-label"><rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.3359375, -9)" style="" class="label"><rect/><foreignObject height="18" width="10.671875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">A</span></div></foreignObject></g></g><g transform="translate(46.28125, 308.5)" title="C" id="flowchart-C_0000946522260503371974-6" class="node default clickable flowchart-label"><rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-5.78125, -9)" style="" class="label"><rect/><foreignObject height="18" width="11.5625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">C</span></div></foreignObject></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 219.125 368" style="max-width: 219.125px; background-color: white;" width="219.125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0001940839474792549233" class="cluster clickable flowchart-label">
+              <rect height="352" width="76.5625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(31.609375, 8)" class="cluster-label">
+                <foreignObject height="18" width="29.34375">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">Two</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths"/>
+          <g class="edgeLabels"/>
+          <g class="nodes">
+            <g transform="translate(46.28125, 59.5)" title="A" id="flowchart-C_0000986505573514384282-4" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">A</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 142.5)" title="B" id="flowchart-C_0002156827588463114203-3" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">B</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 225.5)" title="C" id="flowchart-C_0001653274432960093632-2" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">C</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 308.5)" title="D" id="flowchart-C_0000263095551354153183-1" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">D</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+        <g transform="translate(119.0625, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0001187941209208108244" class="cluster clickable flowchart-label">
+              <rect height="352" width="76.5625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(31.15625, 8)" class="cluster-label">
+                <foreignObject height="18" width="30.25">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">One</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths"/>
+          <g class="edgeLabels"/>
+          <g class="nodes">
+            <g transform="translate(46.28125, 59.5)" title="B" id="flowchart-C_0000209763670816643341-9" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">B</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 142.5)" title="D" id="flowchart-C_0001181245940399690936-8" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">D</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 225.5)" title="A" id="flowchart-C_0001189741240939898414-7" class="node default clickable flowchart-label">
+              <rect height="33" width="25.671875" y="-16.5" x="-12.8359375" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.3359375, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="10.671875">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">A</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+            <g transform="translate(46.28125, 308.5)" title="C" id="flowchart-C_0000946522260503371974-6" class="node default clickable flowchart-label">
+              <rect height="33" width="26.5625" y="-16.5" x="-13.28125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-5.78125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="11.5625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">C</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md
index f3dab758..0862cc8f 100644
--- a/docs/test_cases/t30010.md
+++ b/docs/test_cases/t30010.md
@@ -87,7 +87,7 @@ App app;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30010_package_mermaid.svg b/docs/test_cases/t30010_package_mermaid.svg
index b00c9104..f0026729 100644
--- a/docs/test_cases/t30010_package_mermaid.svg
+++ b/docs/test_cases/t30010_package_mermaid.svg
@@ -1 +1,138 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000879401191375500756" class="cluster default flowchart-label"><rect height="83" width="379.625" y="83" x="0" ry="0" rx="0" style=""/><g transform="translate(161.8046875, 83)" class="cluster-label"><foreignObject height="18" width="56.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">libraries</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(54.953125, 124.5)" id="flowchart-C_0000879212264535378961-1" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1</span></div></foreignObject></g></g><g transform="translate(144.859375, 124.5)" id="flowchart-C_0001522606219626203424-3" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2</span></div></foreignObject></g></g><g transform="translate(234.765625, 124.5)" id="flowchart-C_0002263709579652581325-5" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib3</span></div></foreignObject></g></g><g transform="translate(324.671875, 124.5)" id="flowchart-C_0001103453030023410219-7" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib4</span></div></foreignObject></g></g><g transform="translate(189.8125, 16.5)" id="flowchart-C_0002001320261642080149-0" class="node default default flowchart-label"><rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.3515625, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.703125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">app</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000879401191375500756" class="cluster default flowchart-label">
+          <rect height="83" width="379.625" y="83" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(161.8046875, 83)" class="cluster-label">
+            <foreignObject height="18" width="56.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">libraries</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(54.953125, 124.5)" id="flowchart-C_0000879212264535378961-1" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(144.859375, 124.5)" id="flowchart-C_0001522606219626203424-3" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(234.765625, 124.5)" id="flowchart-C_0002263709579652581325-5" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(324.671875, 124.5)" id="flowchart-C_0001103453030023410219-7" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib4</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(189.8125, 16.5)" id="flowchart-C_0002001320261642080149-0" class="node default default flowchart-label">
+          <rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-13.3515625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="26.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">app</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md
index 35c0399e..c251d6a3 100644
--- a/docs/test_cases/t30011.md
+++ b/docs/test_cases/t30011.md
@@ -77,7 +77,7 @@ struct t30011_App app;
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t30011_package_mermaid.svg b/docs/test_cases/t30011_package_mermaid.svg
index b00c9104..f0026729 100644
--- a/docs/test_cases/t30011_package_mermaid.svg
+++ b/docs/test_cases/t30011_package_mermaid.svg
@@ -1 +1,138 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000879401191375500756" class="cluster default flowchart-label"><rect height="83" width="379.625" y="83" x="0" ry="0" rx="0" style=""/><g transform="translate(161.8046875, 83)" class="cluster-label"><foreignObject height="18" width="56.015625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">libraries</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><g transform="translate(54.953125, 124.5)" id="flowchart-C_0000879212264535378961-1" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1</span></div></foreignObject></g></g><g transform="translate(144.859375, 124.5)" id="flowchart-C_0001522606219626203424-3" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2</span></div></foreignObject></g></g><g transform="translate(234.765625, 124.5)" id="flowchart-C_0002263709579652581325-5" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib3</span></div></foreignObject></g></g><g transform="translate(324.671875, 124.5)" id="flowchart-C_0001103453030023410219-7" class="node default default flowchart-label"><rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-12.453125, -9)" style="" class="label"><rect/><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib4</span></div></foreignObject></g></g><g transform="translate(189.8125, 16.5)" id="flowchart-C_0002001320261642080149-0" class="node default default flowchart-label"><rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.3515625, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.703125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">app</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000879401191375500756" class="cluster default flowchart-label">
+          <rect height="83" width="379.625" y="83" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(161.8046875, 83)" class="cluster-label">
+            <foreignObject height="18" width="56.015625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">libraries</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(54.953125, 124.5)" id="flowchart-C_0000879212264535378961-1" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(144.859375, 124.5)" id="flowchart-C_0001522606219626203424-3" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(234.765625, 124.5)" id="flowchart-C_0002263709579652581325-5" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(324.671875, 124.5)" id="flowchart-C_0001103453030023410219-7" class="node default default flowchart-label">
+          <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.453125, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib4</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(189.8125, 16.5)" id="flowchart-C_0002001320261642080149-0" class="node default default flowchart-label">
+          <rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-13.3515625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="26.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">app</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md
index cae2696f..14abdd43 100644
--- a/docs/test_cases/t40001.md
+++ b/docs/test_cases/t40001.md
@@ -25,9 +25,11 @@ diagrams:
         - 'note right of {{ alias("include/lib1") }}: This is a lib1 include dir'
         - 'note right of {{ alias("include/t40001_include1.h") }}: This is a t40001_include1.h include file'
     mermaid:
+      before:
+        - "%% t40001 test diagram of type {{ diagram.type }}"
       after:
         - 'N_00001(This is a lib1 include dir)-.-{{ alias("include/lib1") }}'
-        - 'N_00002(This is a lib1 include dir)-.-{{ alias("include/t40001_include1.h") }}'
+        - 'N_00002(This is a t40001_include1.h include file)-.-{{ alias("include/t40001_include1.h") }}'
 ```
 ## Source code
 ## Generated PlantUML diagrams
@@ -107,7 +109,7 @@ diagrams:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index e949b94a..b2da2c93 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.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="377px" preserveAspectRatio="none" style="width:676px;height:377px;" version="1.1" viewBox="0 0 676 377" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wrg7n8rthh1c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f90szn8nx83ho" 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"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1wrg7n8rthh1c)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f90szn8nx83ho)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wrg7n8rthh1c)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f90szn8nx83ho)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="157.2969" y2="157.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="149.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wrg7n8rthh1c)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f90szn8nx83ho)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="252.2969" y2="252.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="244.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,59 L283,69 L293,69 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="81.9951">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,170 L185.5,180 L195.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="192.9951">t40001_include1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M144.5,273 L144.5,283 L154.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="295.9951">lib1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,273 L442.5,283 L452.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="295.9951">string</text>
-    <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,170 L354.5,180 L364.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="192.9951">vector</text>
-    <polygon fill="#FEFECE" filter="url(#f1wrg7n8rthh1c)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f90szn8nx83ho)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,273 L348.5,283 L358.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="295.9951">yaml-cpp/yaml.h</text>
-    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#f1wrg7n8rthh1c)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#f90szn8nx83ho)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,278.5 L644.5,288.5 L654.5,288.5 L644.5,278.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="295.5669">This is a lib1 include dir</text>
-    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#f1wrg7n8rthh1c)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#f90szn8nx83ho)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,175.5 L654,185.5 L664,185.5 L654,175.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="192.5669">This is a t40001_include1.h include file</text>
     <path d="M247.19,95.33 C246.91,123.45 250.93,178.61 284,206 C299.81,219.09 358.52,203.24 376,214 C395.8,226.19 408.53,250.17 415.68,267.94 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg
index db0830db..daff004b 100644
--- a/docs/test_cases/t40001_include_mermaid.svg
+++ b/docs/test_cases/t40001_include_mermaid.svg
@@ -1 +1,237 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 871.3984375 365" style="max-width: 871.398px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000989412417490706876" class="cluster default flowchart-label"><rect height="216" width="259.9140625" y="133" x="324.875" ry="0" rx="0" style=""/><g transform="translate(429.48046875, 133)" class="cluster-label"><foreignObject height="18" width="50.703125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">include</span></div></foreignObject></g></g><g id="C_0001387619747296316447" class="cluster default flowchart-label"><rect height="83" width="373.23828125" y="0" x="322.2109375" ry="0" rx="0" style=""/><g transform="translate(498.166015625, 0)" class="cluster-label"><foreignObject height="18" width="21.328125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">src</span></div></foreignObject></g></g><g id="C_0001687675335949018432" class="cluster default flowchart-label"><rect height="83" width="123.25" y="241" x="344.875" ry="0" rx="0" style=""/><g transform="translate(394.046875, 241)" class="cluster-label"><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M595.6608621987951,58L604.1926455823293,62.166666666666664C612.7244289658635,66.33333333333333,629.7879957329318,74.66666666666667,638.3197791164658,83C646.8515625,91.33333333333333,646.8515625,99.66666666666667,646.8515625,108C646.8515625,116.33333333333333,646.8515625,124.66666666666667,646.8515625,135.75C646.8515625,146.83333333333334,646.8515625,160.66666666666666,646.8515625,174.5C646.8515625,188.33333333333334,646.8515625,202.16666666666666,646.8515625,213.25C646.8515625,224.33333333333334,646.8515625,232.66666666666666,646.8515625,241C646.8515625,249.33333333333334,646.8515625,257.6666666666667,646.8515625,261.8333333333333L646.8515625,266"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M519.6796875,51.17106767631006L496.5345052083333,56.47588973025838C473.3893229166667,61.78071178420671,427.0989583333333,72.39035589210336,383.9166666666667,81.86184461271834C340.734375,91.33333333333333,300.66015625,99.66666666666667,280.623046875,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,133C260.5859375,141.33333333333334,260.5859375,149.66666666666666,260.5859375,153.83333333333334L260.5859375,158"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M545.5613704819277,58L541.4417670682732,62.166666666666664C537.3221636546185,66.33333333333333,529.0829568273092,74.66666666666667,524.9633534136547,83C520.84375,91.33333333333333,520.84375,99.66666666666667,520.84375,108C520.84375,116.33333333333333,520.84375,124.66666666666667,516.4315700301205,133C512.0193900602409,141.33333333333334,503.19503012048193,149.66666666666666,498.78285015060237,153.83333333333334L494.37067018072287,158"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M457.183546686747,191L452.20503890562253,195.16666666666666C447.22653112449797,199.33333333333334,437.26951556224896,207.66666666666666,432.2910077811245,216C427.3125,224.33333333333334,427.3125,232.66666666666666,425.2228915662651,241C423.1332831325301,249.33333333333334,418.9540662650602,257.6666666666667,416.8644578313253,261.8333333333333L414.77484939759034,266"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M498.34657379518075,191L503.7627698293173,195.16666666666666C509.17896586345387,199.33333333333334,520.0113579317269,207.66666666666666,525.4275539658635,216C530.84375,224.33333333333334,530.84375,232.66666666666666,563.0221354166666,241.99306477903886C595.2005208333334,251.31946289141106,659.5572916666666,261.6389257828222,691.7356770833334,266.7986572285277L723.9140625,271.9583886742333"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M481.36201054216866,191L482.48917545180717,195.16666666666666C483.6163403614458,199.33333333333334,485.8706701807229,207.66666666666666,486.99783509036143,216C488.125,224.33333333333334,488.125,232.66666666666666,510.0690104166667,242.57072484454727C532.0130208333334,252.47478302242789,575.9010416666666,263.9495660448557,597.8450520833334,269.6869575560697L619.7890625,275.4243490672836"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00002 LE-C_0001926692816440595520" id="L-N_00002-C_0001926692816440595520-0" d="M196.5625,58L196.5625,62.166666666666664C196.5625,66.33333333333333,196.5625,74.66666666666667,233.01432291666666,83C269.4661458333333,91.33333333333333,342.3697916666667,99.66666666666667,378.8216145833333,108C415.2734375,116.33333333333333,415.2734375,124.66666666666667,421.46068649598396,133C427.64793549196787,141.33333333333334,440.0224334839357,149.66666666666666,446.20968247991965,153.83333333333334L452.3969314759036,158"/><path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00001 LE-C_0001687675335949018432" id="L-N_00001-C_0001687675335949018432-0" d="M181.296875,186.83255218337814L217.02864583333334,191.69379348614845C252.76041666666666,196.55503478891876,324.2239583333333,206.27751739445935,359.9557291666667,215.30542536389635C395.6875,224.33333333333334,395.6875,232.66666666666666,395.6875,236.83333333333334L395.6875,241"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><a transform="translate(476.8984375, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/t40001_include1.h#L0"><g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label"><rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-65.390625, -9)" style="" class="label"><rect/><foreignObject height="18" width="130.78125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t40001_include1.h</span></div></foreignObject></g></g></a><a transform="translate(406.5, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/include/lib1/lib1.h#L0"><g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label"><rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-19.125, -9)" style="" class="label"><rect/><foreignObject height="18" width="38.25"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1.h</span></div></foreignObject></g></g></a><a transform="translate(561.875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40001/src/t40001.cc#L0"><g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label"><rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-34.6953125, -9)" style="" class="label"><rect/><foreignObject height="18" width="69.390625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t40001.cc</span></div></foreignObject></g></g></a><g transform="translate(646.8515625, 282.5)" id="flowchart-C_0001687197357150905926-1" class="node default default flowchart-label"><rect height="33" width="54.125" y="-16.5" x="-27.0625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-19.5625, -9)" style="" class="label"><rect/><foreignObject height="18" width="39.125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">string</span></div></foreignObject></g></g><g transform="translate(260.5859375, 174.5)" id="flowchart-C_0000405203884025072971-2" class="node default default flowchart-label"><rect height="33" width="58.578125" y="-16.5" x="-29.2890625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-21.7890625, -9)" style="" class="label"><rect/><foreignObject height="18" width="43.578125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">vector</span></div></foreignObject></g></g><g transform="translate(789.65625, 282.5)" id="flowchart-C_0001659736894483045485-5" class="node default default flowchart-label"><rect height="33" width="131.484375" y="-16.5" x="-65.7421875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-58.2421875, -9)" style="" class="label"><rect/><foreignObject height="18" width="116.484375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">yaml-cpp/yaml.h</span></div></foreignObject></g></g><g transform="translate(90.6484375, 174.5)" id="flowchart-N_00001-18" class="node default default flowchart-label"><rect height="33" width="181.296875" y="-16.5" x="-90.6484375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-83.1484375, -9)" style="" class="label"><rect/><foreignObject height="18" width="166.296875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">This is a lib1 include dir</span></div></foreignObject></g></g><g transform="translate(196.5625, 41.5)" id="flowchart-N_00002-20" class="node default default flowchart-label"><rect height="33" width="181.296875" y="-16.5" x="-90.6484375" ry="5" rx="5" style="" class="basic label-container"/><g transform="translate(-83.1484375, -9)" style="" class="label"><rect/><foreignObject height="18" width="166.296875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">This is a lib1 include dir</span></div></foreignObject></g></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 898.53515625 365" style="max-width: 898.535px; background-color: white;" width="898.53515625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000989412417490706876" class="cluster default flowchart-label">
+          <rect height="216" width="287.05078125" y="133" x="324.875" ry="0" rx="0" style=""/>
+          <g transform="translate(443.048828125, 133)" class="cluster-label">
+            <foreignObject height="18" width="50.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">include</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001387619747296316447" class="cluster default flowchart-label">
+          <rect height="83" width="373.23828125" y="0" x="349.34765625" ry="0" rx="0" style=""/>
+          <g transform="translate(525.302734375, 0)" class="cluster-label">
+            <foreignObject height="18" width="21.328125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">src</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001687675335949018432" class="cluster default flowchart-label">
+          <rect height="83" width="123.25" y="241" x="350.78515625" ry="0" rx="0" style=""/>
+          <g transform="translate(399.95703125, 241)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M622.7975809487951,58L631.3293643323293,62.166666666666664C639.8611477158635,66.33333333333333,656.9247144829318,74.66666666666667,665.4564978664658,83C673.98828125,91.33333333333333,673.98828125,99.66666666666667,673.98828125,108C673.98828125,116.33333333333333,673.98828125,124.66666666666667,673.98828125,135.75C673.98828125,146.83333333333334,673.98828125,160.66666666666666,673.98828125,174.5C673.98828125,188.33333333333334,673.98828125,202.16666666666666,673.98828125,213.25C673.98828125,224.33333333333334,673.98828125,232.66666666666666,673.98828125,241C673.98828125,249.33333333333334,673.98828125,257.6666666666667,673.98828125,261.8333333333333L673.98828125,266"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M546.81640625,51.17106767631006L523.6712239583334,56.47588973025838C500.5260416666667,61.78071178420671,454.2356770833333,72.39035589210336,406.5305989583333,81.86184461271834C358.8255208333333,91.33333333333333,309.7057291666667,99.66666666666667,285.1458333333333,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,133C260.5859375,141.33333333333334,260.5859375,149.66666666666666,260.5859375,153.83333333333334L260.5859375,158"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M572.6980892319277,58L568.5784858182732,62.166666666666664C564.4588824046185,66.33333333333333,556.2196755773092,74.66666666666667,552.1000721636547,83C547.98046875,91.33333333333333,547.98046875,99.66666666666667,547.98046875,108C547.98046875,116.33333333333333,547.98046875,124.66666666666667,543.5682887801205,133C539.1561088102409,141.33333333333334,530.3317488704819,149.66666666666666,525.9195689006024,153.83333333333334L521.5073889307229,158"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M473.53096762048193,191L465.8278896837349,195.16666666666666C458.124811746988,199.33333333333334,442.718655873494,207.66666666666666,435.015577936747,216C427.3125,224.33333333333334,427.3125,232.66666666666666,425.8162807479919,241C424.3200614959839,249.33333333333334,421.32762299196787,257.6666666666667,419.8314037399598,261.8333333333333L418.3351844879518,266"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M525.4832925451807,191L530.8994885793172,195.16666666666666C536.3156846134538,199.33333333333334,547.1480766817268,207.66666666666666,552.5642727158635,216C557.98046875,224.33333333333334,557.98046875,232.66666666666666,590.1588541666666,241.99306477903886C622.3372395833334,251.31946289141106,686.6940104166666,261.6389257828222,718.8723958333334,266.7986572285277L751.05078125,271.9583886742333"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M500.0592526355422,191L499.05523657128515,195.16666666666666C498.0512205070281,199.33333333333334,496.04318837851406,207.66666666666666,495.03917231425703,216C494.03515625,224.33333333333334,494.03515625,232.66666666666666,519.5169270833334,242.70982750137478C544.9986979166666,252.7529883360829,595.9622395833334,264.5059766721658,621.4440104166666,270.3824708402072L646.92578125,276.25896500824865"/>
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00002 LE-C_0001926692816440595520" id="L-N_00002-C_0001926692816440595520-0" d="M169.42578125,58L169.42578125,62.166666666666664C169.42578125,66.33333333333333,169.42578125,74.66666666666667,212.271484375,83C255.1171875,91.33333333333333,340.80859375,99.66666666666667,383.654296875,108C426.5,116.33333333333333,426.5,124.66666666666667,434.28465424196787,133C442.0693084839357,141.33333333333334,457.6386169678715,149.66666666666666,465.42327120983936,153.83333333333334L473.2079254518072,158"/>
+        <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00001 LE-C_0001687675335949018432" id="L-N_00001-C_0001687675335949018432-0" d="M181.296875,186.83255218337814L217.02864583333334,191.69379348614845C252.76041666666666,196.55503478891876,324.2239583333333,206.27751739445935,359.9557291666667,215.30542536389635C395.6875,224.33333333333334,395.6875,232.66666666666666,395.6875,236.83333333333334L395.6875,241"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/t40001_include1.h#L0">
+          <g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label">
+            <rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-65.390625, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="130.78125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t40001_include1.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/include/lib1/lib1.h#L0">
+          <g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label">
+            <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-19.125, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="38.25">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">lib1.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40001/src/t40001.cc#L0">
+          <g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label">
+            <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-34.6953125, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="69.390625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t40001.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <g transform="translate(673.98828125, 282.5)" id="flowchart-C_0001687197357150905926-1" class="node default default flowchart-label">
+          <rect height="33" width="54.125" y="-16.5" x="-27.0625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-19.5625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="39.125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">string</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(260.5859375, 174.5)" id="flowchart-C_0000405203884025072971-2" class="node default default flowchart-label">
+          <rect height="33" width="58.578125" y="-16.5" x="-29.2890625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-21.7890625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="43.578125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">vector</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(816.79296875, 282.5)" id="flowchart-C_0001659736894483045485-5" class="node default default flowchart-label">
+          <rect height="33" width="131.484375" y="-16.5" x="-65.7421875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-58.2421875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="116.484375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">yaml-cpp/yaml.h</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(90.6484375, 174.5)" id="flowchart-N_00001-18" class="node default default flowchart-label">
+          <rect height="33" width="181.296875" y="-16.5" x="-90.6484375" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-83.1484375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="166.296875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is a lib1 include dir</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(169.42578125, 41.5)" id="flowchart-N_00002-20" class="node default default flowchart-label">
+          <rect height="33" width="289.84375" y="-16.5" x="-144.921875" ry="5" rx="5" style="" class="basic label-container"/>
+          <g transform="translate(-137.421875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="274.84375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">This is a t40001_include1.h include file</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md
index 15a0c02d..0b8679aa 100644
--- a/docs/test_cases/t40002.md
+++ b/docs/test_cases/t40002.md
@@ -121,7 +121,7 @@ diagrams:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index 0d1f74de..7bea8ec7 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.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="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1nnykwjkkea2j" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmgwyrarfn69r" 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"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1nnykwjkkea2j)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fmgwyrarfn69r)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1nnykwjkkea2j)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fmgwyrarfn69r)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1nnykwjkkea2j)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fmgwyrarfn69r)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1nnykwjkkea2j)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fmgwyrarfn69r)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1nnykwjkkea2j)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fmgwyrarfn69r)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1nnykwjkkea2j)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fmgwyrarfn69r)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
     </a>
diff --git a/docs/test_cases/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg
index 6373a988..61802b75 100644
--- a/docs/test_cases/t40002_include_mermaid.svg
+++ b/docs/test_cases/t40002_include_mermaid.svg
@@ -1 +1,208 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 504.7265625 465" style="max-width: 504.727px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000989412417490706876" class="cluster default flowchart-label"><rect height="266" width="445.76171875" y="183" x="0" ry="0" rx="0" style=""/><g transform="translate(197.529296875, 183)" class="cluster-label"><foreignObject height="18" width="50.703125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">include</span></div></foreignObject></g></g><g id="C_0001387619747296316447" class="cluster default flowchart-label"><rect height="133" width="477.9140625" y="0" x="10.8125" ry="0" rx="0" style=""/><g transform="translate(239.10546875, 0)" class="cluster-label"><foreignObject height="18" width="21.328125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">src</span></div></foreignObject></g></g><g id="C_0001687675335949018432" class="cluster default flowchart-label"><rect height="83" width="207.6171875" y="208" x="88.59765625" ry="0" rx="0" style=""/><g transform="translate(179.953125, 208)" class="cluster-label"><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1</span></div></foreignObject></g></g><g id="C_0001248530620501446930" class="cluster default flowchart-label"><rect height="83" width="405.76171875" y="341" x="20" ry="0" rx="0" style=""/><g transform="translate(210.427734375, 341)" class="cluster-label"><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2</span></div></foreignObject></g></g><g id="C_0001284742705549910910" class="cluster default flowchart-label"><rect height="83" width="130.359375" y="25" x="188.0078125" ry="0" rx="0" style=""/><g transform="translate(240.734375, 25)" class="cluster-label"><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1</span></div></foreignObject></g></g><g id="C_0001397224709580110803" class="cluster default flowchart-label"><rect height="83" width="130.359375" y="25" x="338.3671875" ry="0" rx="0" style=""/><g transform="translate(391.09375, 25)" class="cluster-label"><foreignObject height="18" width="24.90625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,147.20638020833334,208.24113937523282C155.00260416666666,216.81561208379898,170.59505208333334,225.63122416759794,178.39127604166666,230.03903020949744L186.1875,234.44683625139695"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,87.82682291666667,342.453125C107.05598958333333,352.2395833333333,145.51432291666666,363.4791666666667,164.74348958333334,369.0989583333333L183.97265625,374.71875"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.13378514056225,208C245.08007028112448,216.33333333333334,236.97264056224898,224.66666666666666,232.9189257028112,228.83333333333334L228.8652108433735,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,375.826171875,342.7955714141108C348.10546875,352.9244761615548,292.6640625,364.84895232310964,264.943359375,370.8111904038871L237.22265625,376.77342848466446"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.5901261295181,341C212.36775225903614,349.3333333333333,211.92300451807228,357.6666666666667,211.70063064759037,361.8333333333333L211.47825677710844,366"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib2/lib2.h#L0"><g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label"><rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-19.125, -9)" style="" class="label"><rect/><foreignObject height="18" width="38.25"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2.h</span></div></foreignObject></g></g></a><a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/include/lib1/lib1.h#L0"><g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label"><rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-19.125, -9)" style="" class="label"><rect/><foreignObject height="18" width="38.25"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1.h</span></div></foreignObject></g></g></a><a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/t40002.cc#L0"><g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label"><rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-34.6953125, -9)" style="" class="label"><rect/><foreignObject height="18" width="69.390625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t40002.cc</span></div></foreignObject></g></g></a><a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib2/lib2.cc#L0"><g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label"><rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-22.6796875, -9)" style="" class="label"><rect/><foreignObject height="18" width="45.359375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib2.cc</span></div></foreignObject></g></g></a><a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40002/src/lib1/lib1.cc#L0"><g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label"><rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-22.6796875, -9)" style="" class="label"><rect/><foreignObject height="18" width="45.359375"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">lib1.cc</span></div></foreignObject></g></g></a></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 504.7265625 465" style="max-width: 504.727px; background-color: white;" width="504.7265625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000989412417490706876" class="cluster default flowchart-label">
+          <rect height="266" width="445.76171875" y="183" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(197.529296875, 183)" class="cluster-label">
+            <foreignObject height="18" width="50.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">include</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001387619747296316447" class="cluster default flowchart-label">
+          <rect height="133" width="477.9140625" y="0" x="10.8125" ry="0" rx="0" style=""/>
+          <g transform="translate(239.10546875, 0)" class="cluster-label">
+            <foreignObject height="18" width="21.328125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">src</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001687675335949018432" class="cluster default flowchart-label">
+          <rect height="83" width="207.6171875" y="208" x="88.59765625" ry="0" rx="0" style=""/>
+          <g transform="translate(179.953125, 208)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001248530620501446930" class="cluster default flowchart-label">
+          <rect height="83" width="405.76171875" y="341" x="20" ry="0" rx="0" style=""/>
+          <g transform="translate(210.427734375, 341)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001284742705549910910" class="cluster default flowchart-label">
+          <rect height="83" width="130.359375" y="25" x="188.0078125" ry="0" rx="0" style=""/>
+          <g transform="translate(240.734375, 25)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001397224709580110803" class="cluster default flowchart-label">
+          <rect height="83" width="130.359375" y="25" x="338.3671875" ry="0" rx="0" style=""/>
+          <g transform="translate(391.09375, 25)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,147.20638020833334,208.24113937523282C155.00260416666666,216.81561208379898,170.59505208333334,225.63122416759794,178.39127604166666,230.03903020949744L186.1875,234.44683625139695"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,87.82682291666667,342.453125C107.05598958333333,352.2395833333333,145.51432291666666,363.4791666666667,164.74348958333334,369.0989583333333L183.97265625,374.71875"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.13378514056225,208C245.08007028112448,216.33333333333334,236.97264056224898,224.66666666666666,232.9189257028112,228.83333333333334L228.8652108433735,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,375.826171875,342.7955714141108C348.10546875,352.9244761615548,292.6640625,364.84895232310964,264.943359375,370.8111904038871L237.22265625,376.77342848466446"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.5901261295181,341C212.36775225903614,349.3333333333333,211.92300451807228,357.6666666666667,211.70063064759037,361.8333333333333L211.47825677710844,366"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib2/lib2.h#L0">
+          <g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label">
+            <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-19.125, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="38.25">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">lib2.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/include/lib1/lib1.h#L0">
+          <g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label">
+            <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-19.125, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="38.25">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">lib1.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/t40002.cc#L0">
+          <g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label">
+            <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-34.6953125, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="69.390625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t40002.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib2/lib2.cc#L0">
+          <g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label">
+            <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-22.6796875, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="45.359375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">lib2.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40002/src/lib1/lib1.cc#L0">
+          <g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label">
+            <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-22.6796875, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="45.359375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">lib1.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md
index 08d9074d..d7009117 100644
--- a/docs/test_cases/t40003.md
+++ b/docs/test_cases/t40003.md
@@ -147,7 +147,7 @@ diagrams:
     }
   ],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index 8a548f14..c69451d1 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.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="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fuc8bfrt100mp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f9fiy1duot7f7" 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"/>
@@ -9,66 +9,66 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fuc8bfrt100mp)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f9fiy1duot7f7)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fuc8bfrt100mp)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f9fiy1duot7f7)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
     </a>
diff --git a/docs/test_cases/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg
index a6907de6..3512df85 100644
--- a/docs/test_cases/t40003_include_mermaid.svg
+++ b/docs/test_cases/t40003_include_mermaid.svg
@@ -1 +1,290 @@
-<svg aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 398.171875 498" style="max-width: 398.172px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/></marker><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart"><path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart"><circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart"><path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/></marker><g class="root"><g class="clusters"><g id="C_0000989412417490706876" class="cluster default flowchart-label"><rect height="299" width="378.6171875" y="183" x="3.5546875" ry="0" rx="0" style=""/><g transform="translate(167.51171875, 183)" class="cluster-label"><foreignObject height="18" width="50.703125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">include</span></div></foreignObject></g></g><g id="C_0001387619747296316447" class="cluster default flowchart-label"><rect height="133" width="366.02734375" y="0" x="0" ry="0" rx="0" style=""/><g transform="translate(172.349609375, 0)" class="cluster-label"><foreignObject height="18" width="21.328125"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">src</span></div></foreignObject></g></g><g id="C_0001763526330848915994" class="cluster default flowchart-label"><rect height="249" width="111.6875" y="208" x="23.5546875" ry="0" rx="0" style=""/><g transform="translate(37.578125, 208)" class="cluster-label"><foreignObject height="18" width="83.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependants</span></div></foreignObject></g></g><g id="C_0001833478793852674517" class="cluster default flowchart-label"><rect height="249" width="203.375" y="208" x="158.796875" ry="0" rx="0" style=""/><g transform="translate(210.6640625, 208)" class="cluster-label"><foreignObject height="18" width="99.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependencies</span></div></foreignObject></g></g><g id="C_0001128556599972003761" class="cluster default flowchart-label"><rect height="83" width="118.796875" y="25" x="20" ry="0" rx="0" style=""/><g transform="translate(37.578125, 25)" class="cluster-label"><foreignObject height="18" width="83.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependants</span></div></foreignObject></g></g><g id="C_0002015386828772336316" class="cluster default flowchart-label"><rect height="83" width="181.0859375" y="25" x="164.94140625" ry="0" rx="0" style=""/><g transform="translate(205.6640625, 25)" class="cluster-label"><foreignObject height="18" width="99.640625"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">dependencies</span></div></foreignObject></g></g></g><g class="edgePaths"><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,208C79.3984375,216.33333333333334,79.3984375,224.66666666666666,79.3984375,228.83333333333334L79.3984375,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,208C214.640625,216.33333333333334,214.640625,224.66666666666666,214.640625,228.83333333333334L214.640625,233"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,288.25C306.328125,299.3333333333333,306.328125,307.6666666666667,306.328125,311.8333333333333L306.328125,316"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,291C79.3984375,299.3333333333333,79.3984375,307.6666666666667,79.3984375,311.8333333333333L79.3984375,316"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,374C79.3984375,382.3333333333333,79.3984375,390.6666666666667,79.3984375,394.8333333333333L79.3984375,399"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,291C214.640625,299.3333333333333,214.640625,307.6666666666667,214.640625,311.8333333333333L214.640625,316"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,219.24341114457832,374C223.84619728915663,382.3333333333333,233.05176957831327,390.6666666666667,237.6545557228916,394.8333333333333L242.25734186746988,399"/><path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,301.7253388554217,374C297.12255271084337,382.3333333333333,287.91698042168673,390.6666666666667,283.3141942771084,394.8333333333333L278.7114081325301,399"/></g><g class="edgeLabels"><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g><g class="edgeLabel"><g transform="translate(0, 0)" class="label"><foreignObject height="0" width="0"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="edgeLabel"></span></div></foreignObject></g></g></g><g class="nodes"><a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t3.h#L0"><g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t3.h</span></div></foreignObject></g></g></a><a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t2.h#L0"><g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t2.h</span></div></foreignObject></g></g></a><a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t1.h#L0"><g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t1.h</span></div></foreignObject></g></g></a><a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependencies/t5.h#L0"><g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t5.h</span></div></foreignObject></g></g></a><a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t3.h#L0"><g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t3.h</span></div></foreignObject></g></g></a><a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t2.h#L0"><g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t2.h</span></div></foreignObject></g></g></a><a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/include/dependants/t1.h#L0"><g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label"><rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-13.34375, -9)" style="" class="label"><rect/><foreignObject height="18" width="26.6875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t1.h</span></div></foreignObject></g></g></a><a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependencies/t2.cc#L0"><g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label"><rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.8984375, -9)" style="" class="label"><rect/><foreignObject height="18" width="33.796875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t2.cc</span></div></foreignObject></g></g></a><a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/4a19c8ba23e5755737ee01c705889152287c82bd/tests/t40003/src/dependants/t1.cc#L0"><g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label"><rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/><g transform="translate(-16.8984375, -9)" style="" class="label"><rect/><foreignObject height="18" width="33.796875"><div style="display: inline-block; white-space: nowrap;" xmlns="http://www.w3.org/1999/xhtml"><span class="nodeLabel">t1.cc</span></div></foreignObject></g></g></a></g></g></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 398.171875 498" style="max-width: 398.172px; background-color: white;" width="398.171875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0000989412417490706876" class="cluster default flowchart-label">
+          <rect height="299" width="378.6171875" y="183" x="3.5546875" ry="0" rx="0" style=""/>
+          <g transform="translate(167.51171875, 183)" class="cluster-label">
+            <foreignObject height="18" width="50.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">include</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001387619747296316447" class="cluster default flowchart-label">
+          <rect height="133" width="366.02734375" y="0" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(172.349609375, 0)" class="cluster-label">
+            <foreignObject height="18" width="21.328125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">src</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001763526330848915994" class="cluster default flowchart-label">
+          <rect height="249" width="111.6875" y="208" x="23.5546875" ry="0" rx="0" style=""/>
+          <g transform="translate(37.578125, 208)" class="cluster-label">
+            <foreignObject height="18" width="83.640625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">dependants</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001833478793852674517" class="cluster default flowchart-label">
+          <rect height="249" width="203.375" y="208" x="158.796875" ry="0" rx="0" style=""/>
+          <g transform="translate(210.6640625, 208)" class="cluster-label">
+            <foreignObject height="18" width="99.640625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">dependencies</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001128556599972003761" class="cluster default flowchart-label">
+          <rect height="83" width="118.796875" y="25" x="20" ry="0" rx="0" style=""/>
+          <g transform="translate(37.578125, 25)" class="cluster-label">
+            <foreignObject height="18" width="83.640625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">dependants</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0002015386828772336316" class="cluster default flowchart-label">
+          <rect height="83" width="181.0859375" y="25" x="164.94140625" ry="0" rx="0" style=""/>
+          <g transform="translate(205.6640625, 25)" class="cluster-label">
+            <foreignObject height="18" width="99.640625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">dependencies</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,208C79.3984375,216.33333333333334,79.3984375,224.66666666666666,79.3984375,228.83333333333334L79.3984375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,208C214.640625,216.33333333333334,214.640625,224.66666666666666,214.640625,228.83333333333334L214.640625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,288.25C306.328125,299.3333333333333,306.328125,307.6666666666667,306.328125,311.8333333333333L306.328125,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,291C79.3984375,299.3333333333333,79.3984375,307.6666666666667,79.3984375,311.8333333333333L79.3984375,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,374C79.3984375,382.3333333333333,79.3984375,390.6666666666667,79.3984375,394.8333333333333L79.3984375,399"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,291C214.640625,299.3333333333333,214.640625,307.6666666666667,214.640625,311.8333333333333L214.640625,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,219.24341114457832,374C223.84619728915663,382.3333333333333,233.05176957831327,390.6666666666667,237.6545557228916,394.8333333333333L242.25734186746988,399"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,301.7253388554217,374C297.12255271084337,382.3333333333333,287.91698042168673,390.6666666666667,283.3141942771084,394.8333333333333L278.7114081325301,399"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t3.h#L0">
+          <g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t3.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t2.h#L0">
+          <g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t2.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t1.h#L0">
+          <g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t1.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependencies/t5.h#L0">
+          <g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t5.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t3.h#L0">
+          <g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t3.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t2.h#L0">
+          <g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t2.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/include/dependants/t1.h#L0">
+          <g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label">
+            <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-13.34375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="26.6875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t1.h</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependencies/t2.cc#L0">
+          <g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label">
+            <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-16.8984375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="33.796875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t2.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7e22b0b6825968b1b4d6787cd3fd6894a88e2fa6/tests/t40003/src/dependants/t1.cc#L0">
+          <g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label">
+            <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
+            <g transform="translate(-16.8984375, -9)" style="" class="label">
+              <rect/>
+              <foreignObject height="18" width="33.796875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">t1.cc</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md
index 4ae6d9c9..a4377c0e 100644
--- a/docs/test_cases/t90000.md
+++ b/docs/test_cases/t90000.md
@@ -50,7 +50,7 @@ File t90000.cc
   "diagram_type": "class",
   "elements": [],
   "metadata": {
-    "clang_uml_version": "0.3.9-11-g4a19c8b",
+    "clang_uml_version": "0.3.9-23-g7e22b0b",
     "llvm_version": "Ubuntu clang version 16.0.1 (++20230328073357+42d1b276f779-1~exp1~20230328073502.65)",
     "schema_version": 1
   },
diff --git a/docs/test_cases/t90000_class_mermaid.svg b/docs/test_cases/t90000_class_mermaid.svg
index 41704b50..ea66542d 100644
--- a/docs/test_cases/t90000_class_mermaid.svg
+++ b/docs/test_cases/t90000_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 490.03125 309" style="max-width: 490.031px; background-color: white;" width="100%" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 490.03125 309" style="max-width: 490.031px; background-color: white;" width="490.03125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
diff --git a/util/format_svg.py b/util/format_svg.py
index dd244066..9ef13f19 100755
--- a/util/format_svg.py
+++ b/util/format_svg.py
@@ -42,11 +42,10 @@ def main(argv):
 
         # Add style color for <a> links
         defs = tree.xpath('//svg:defs', namespaces={'svg':'http://www.w3.org/2000/svg'})
-        if not defs:
-            continue
-        style = etree.SubElement(defs[0], 'style')
-        style.text = 'a:hover { text-decoration: underline; }'
-        style.set('type', 'text/css')
+        if defs:
+            style = etree.SubElement(defs[0], 'style')
+            style.text = 'a:hover { text-decoration: underline; }'
+            style.set('type', 'text/css')
 
         # Remove comments from SVG, to minimize diff
         # when updating diagrams in Git