From 07ba6fd5ed00c56e6c6f4cbade88a78706fabe04 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 27 Feb 2022 00:58:30 +0100
Subject: [PATCH] Updated test cases documentation

---
 docs/test_cases/t00002_class.svg   |  81 ++++++-------
 docs/test_cases/t00003_class.svg   |   9 +-
 docs/test_cases/t00004_class.svg   |  39 +++---
 docs/test_cases/t00005_class.svg   | 117 +++++++++---------
 docs/test_cases/t00006_class.svg   | 183 +++++++++++++++--------------
 docs/test_cases/t00007_class.svg   |  39 +++---
 docs/test_cases/t00008_class.svg   |  41 +++----
 docs/test_cases/t00009_class.svg   |  57 ++++-----
 docs/test_cases/t00010_class.svg   |  49 ++++----
 docs/test_cases/t00011_class.svg   |  28 ++---
 docs/test_cases/t00012_class.svg   |  99 ++++++++--------
 docs/test_cases/t00013_class.svg   | 115 +++++++++---------
 docs/test_cases/t00014_class.svg   | 115 +++++++++---------
 docs/test_cases/t00015_class.svg   |  51 ++++----
 docs/test_cases/t00016_class.svg   |  49 ++++----
 docs/test_cases/t00017_class.svg   | 135 ++++++++++-----------
 docs/test_cases/t00018_class.svg   |  23 ++--
 docs/test_cases/t00019_class.svg   |  91 +++++++-------
 docs/test_cases/t00020_class.svg   |  97 +++++++--------
 docs/test_cases/t00021_class.svg   | 109 ++++++++---------
 docs/test_cases/t00022_class.svg   |  29 ++---
 docs/test_cases/t00023_class.svg   |  53 +++++----
 docs/test_cases/t00024_class.svg   |  47 ++++----
 docs/test_cases/t00025_class.svg   |  63 +++++-----
 docs/test_cases/t00026_class.svg   |  67 +++++------
 docs/test_cases/t00027_class.svg   | 117 +++++++++---------
 docs/test_cases/t00028_class.svg   | 121 +++++++++----------
 docs/test_cases/t00029_class.svg   |  67 +++++------
 docs/test_cases/t00030_class.svg   |  49 ++++----
 docs/test_cases/t00031_class.svg   |  59 +++++-----
 docs/test_cases/t00032_class.svg   |  95 +++++++--------
 docs/test_cases/t00033_class.svg   |  79 +++++++------
 docs/test_cases/t00034_class.svg   |  57 ++++-----
 docs/test_cases/t00035_class.svg   |  49 ++++----
 docs/test_cases/t00036_class.svg   |  63 +++++-----
 docs/test_cases/t30001_package.svg |  34 +++---
 docs/test_cases/t30002_package.svg |  98 +++++++--------
 docs/test_cases/t30003_package.svg |  24 ++--
 docs/test_cases/t30004_package.svg |  34 +++---
 docs/test_cases/t30005_package.svg |  40 +++----
 docs/test_cases/t30006_package.svg |  24 ++--
 docs/test_cases/t30007_package.svg |  36 +++---
 42 files changed, 1434 insertions(+), 1398 deletions(-)

diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index e9b79297..9af0b1d9 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,57 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:462px;height:362px;" version="1.1" viewBox="0 0 462 362" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="furs4w1pcy990" 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></defs><g><!--MD5=[b1183f28f772e6b024d4c382feaa87e2]
-class C_0000000001--><rect fill="#FEFECE" filter="url(#furs4w1pcy990)" height="73.6094" id="C_0000000001" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="215.5" y="8"/><ellipse cx="269.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M269.8594,19.3438 L268.7031,24.4219 L271.0313,24.4219 L269.8594,19.3438 Z M268.375,17.1094 L271.3594,17.1094 L274.7188,29.5 L272.2656,29.5 L271.5,26.4375 L268.2188,26.4375 L267.4688,29.5 L265.0313,29.5 L268.375,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="290.25" y="28.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="216.5" x2="339.5" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="216.5" x2="339.5" y1="48" y2="48"/><ellipse cx="226.5" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="235.5" y="62.2104">foo_a() = 0 : void</text><ellipse cx="226.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="235.5" y="75.0151">foo_c() = 0 : void</text><!--MD5=[beff0c4640d168cedf062bb151026421]
-class C_0000000003--><rect fill="#FEFECE" filter="url(#furs4w1pcy990)" height="60.8047" id="C_0000000003" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="297" y="143"/><ellipse cx="339" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.9688,164.6406 Q341.3906,164.9375 340.75,165.0781 Q340.1094,165.2344 339.4063,165.2344 Q336.9063,165.2344 335.5781,163.5938 Q334.2656,161.9375 334.2656,158.8125 Q334.2656,155.6875 335.5781,154.0313 Q336.9063,152.375 339.4063,152.375 Q340.1094,152.375 340.75,152.5313 Q341.4063,152.6875 341.9688,152.9844 L341.9688,155.7031 Q341.3438,155.125 340.75,154.8594 Q340.1563,154.5781 339.5313,154.5781 Q338.1875,154.5781 337.5,155.6563 Q336.8125,156.7188 336.8125,158.8125 Q336.8125,160.9063 337.5,161.9844 Q338.1875,163.0469 339.5313,163.0469 Q340.1563,163.0469 340.75,162.7813 Q341.3438,162.5 341.9688,161.9219 L341.9688,164.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359" y="163.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="396" y1="175" y2="175"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="396" y1="183" y2="183"/><ellipse cx="308" cy="194" 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="74" x="317" y="197.2104">foo_a() : void</text><!--MD5=[18c047a639bbed34c417ca7fb6966b16]
-class C_0000000005--><rect fill="#FEFECE" filter="url(#furs4w1pcy990)" height="60.8047" id="C_0000000005" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="162.5" y="143"/><ellipse cx="204.05" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M207.0188,164.6406 Q206.4406,164.9375 205.8,165.0781 Q205.1594,165.2344 204.4563,165.2344 Q201.9563,165.2344 200.6281,163.5938 Q199.3156,161.9375 199.3156,158.8125 Q199.3156,155.6875 200.6281,154.0313 Q201.9563,152.375 204.4563,152.375 Q205.1594,152.375 205.8,152.5313 Q206.4563,152.6875 207.0188,152.9844 L207.0188,155.7031 Q206.3938,155.125 205.8,154.8594 Q205.2063,154.5781 204.5813,154.5781 Q203.2375,154.5781 202.55,155.6563 Q201.8625,156.7188 201.8625,158.8125 Q201.8625,160.9063 202.55,161.9844 Q203.2375,163.0469 204.5813,163.0469 Q205.2063,163.0469 205.8,162.7813 Q206.3938,162.5 207.0188,161.9219 L207.0188,164.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="223.95" y="163.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="260.5" y1="175" y2="175"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="260.5" y1="183" y2="183"/><ellipse cx="173.5" cy="194" 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="73" x="182.5" y="197.2104">foo_c() : void</text><!--MD5=[818353795a49a6973a503ac8115e4dab]
-class C_0000000007--><rect fill="#FEFECE" filter="url(#furs4w1pcy990)" height="86.4141" id="C_0000000007" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="276" y="265"/><ellipse cx="339.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M342.2188,286.6406 Q341.6406,286.9375 341,287.0781 Q340.3594,287.2344 339.6563,287.2344 Q337.1563,287.2344 335.8281,285.5938 Q334.5156,283.9375 334.5156,280.8125 Q334.5156,277.6875 335.8281,276.0313 Q337.1563,274.375 339.6563,274.375 Q340.3594,274.375 341,274.5313 Q341.6563,274.6875 342.2188,274.9844 L342.2188,277.7031 Q341.5938,277.125 341,276.8594 Q340.4063,276.5781 339.7813,276.5781 Q338.4375,276.5781 337.75,277.6563 Q337.0625,278.7188 337.0625,280.8125 Q337.0625,282.9063 337.75,283.9844 Q338.4375,285.0469 339.7813,285.0469 Q340.4063,285.0469 341,284.7813 Q341.5938,284.5 342.2188,283.9219 L342.2188,286.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="359.75" y="285.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="419" y1="297" y2="297"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="284" y="305"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="296" y="311.2104">as : std::vector&lt;A*&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="419" y1="317.8047" y2="317.8047"/><ellipse cx="287" cy="328.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="74" x="296" y="332.0151">foo_a() : void</text><ellipse cx="287" cy="341.6094" 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="73" x="296" y="344.8198">foo_c() : void</text><!--MD5=[e3f35d1775ade35663e31262a0ff8c2e]
-class C_0000000011--><rect fill="#FEFECE" filter="url(#furs4w1pcy990)" height="86.4141" id="C_0000000011" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="97" y="265"/><ellipse cx="160.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M163.7188,286.6406 Q163.1406,286.9375 162.5,287.0781 Q161.8594,287.2344 161.1563,287.2344 Q158.6563,287.2344 157.3281,285.5938 Q156.0156,283.9375 156.0156,280.8125 Q156.0156,277.6875 157.3281,276.0313 Q158.6563,274.375 161.1563,274.375 Q161.8594,274.375 162.5,274.5313 Q163.1563,274.6875 163.7188,274.9844 L163.7188,277.7031 Q163.0938,277.125 162.5,276.8594 Q161.9063,276.5781 161.2813,276.5781 Q159.9375,276.5781 159.25,277.6563 Q158.5625,278.7188 158.5625,280.8125 Q158.5625,282.9063 159.25,283.9844 Q159.9375,285.0469 161.2813,285.0469 Q161.9063,285.0469 162.5,284.7813 Q163.0938,284.5 163.7188,283.9219 L163.7188,286.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="181.25" y="285.1543">E</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="240" y1="297" y2="297"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="305"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="117" y="311.2104">as : std::vector&lt;A*&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="240" y1="317.8047" y2="317.8047"/><ellipse cx="108" cy="328.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="74" x="117" y="332.0151">foo_a() : void</text><ellipse cx="108" cy="341.6094" 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="73" x="117" y="344.8198">foo_c() : void</text><path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L180,57.6328 A0,0 0 0 0 180,57.6328 L180,50.5 L215.27,45 L180,42.5 L180,42.5 L170,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#furs4w1pcy990)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M170,32.5 L170,42.5 L180,42.5 L170,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="153" x="12" y="49.5669">Base abstract interface.</text><!--MD5=[2035fd437a8abfbdc2f15fdb850511c5]
-reverse link C_0000000001 to C_0000000003--><path d="M307.52,100.12 C315.47,114.69 323.78,129.93 330.71,142.64 " fill="none" id="C_0000000001&lt;-C_0000000003" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="301.2,103.16,297.77,82.25,313.49,96.46,301.2,103.16" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8257efa0eb28eb11690f718dcf595ab9]
-reverse link C_0000000001 to C_0000000005--><path d="M249.76,100.12 C242.16,114.69 234.21,129.93 227.58,142.64 " fill="none" id="C_0000000001&lt;-C_0000000005" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="243.63,96.74,259.09,82.25,256.04,103.22,243.63,96.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2ddb6a99ab191184a60ec67a4689c2ac]
-reverse link C_0000000003 to C_0000000007--><path d="M347.38,224.61 C347.48,237.85 347.59,252.02 347.68,264.8 " fill="none" id="C_0000000003&lt;-C_0000000007" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="340.38,224.29,347.22,204.24,354.38,224.18,340.38,224.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0de750b3303744d5dfe04ded3da11c90]
-reverse link C_0000000005 to C_0000000007--><path d="M257.12,218.46 C272.44,233.38 289.51,250.02 304.69,264.8 " fill="none" id="C_0000000005&lt;-C_0000000007" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="251.96,223.21,242.52,204.24,261.73,213.18,251.96,223.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[417f5911cfff80224c21a7a8c45d686c]
-reverse link C_0000000003 to C_0000000011--><path d="M290.75,216.37 C270,231.82 246.48,249.32 225.69,264.8 " fill="none" id="C_0000000003&lt;-C_0000000011" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="286.83,210.56,307.05,204.24,295.19,221.79,286.83,210.56" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[16da2bc5999c48551c1744d40cf34a1e]
-reverse link C_0000000005 to C_0000000011--><path d="M196.05,223.65 C191.66,237.17 186.94,251.71 182.69,264.8 " fill="none" id="C_0000000005&lt;-C_0000000011" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="189.52,221.1,202.35,204.24,202.83,225.42,189.52,221.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1485c29c1d8f250ad526d58975847769]
-link C_0000000007 to C_0000000001--><path d="M384.94,264.94 C409.83,231.23 434.66,183.11 414,143 C399.25,114.36 371.7,92.31 345.23,76.53 " fill="none" id="C_0000000007-&gt;C_0000000001" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="340.65,73.85,346.4036,81.8435,344.9673,76.372,350.4388,74.9357,340.65,73.85" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="425" y="171.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="435" y="178.0669">as</text><!--MD5=[02dbf8f0d16de306293c1df7504c5bf2]
-link C_0000000011 to C_0000000001--><path d="M137.22,264.98 C115.43,230.65 94.09,181.66 116,143 C126.87,123.82 171.06,98.01 210.54,77.83 " fill="none" id="C_0000000011-&gt;C_0000000001" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="215.33,75.4,205.4937,75.8975,210.8694,77.6589,209.108,83.0346,215.33,75.4" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="119" y="171.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="129" y="178.0669">as</text><!--MD5=[85de6599e801aabdf0344ef6bbabd1da]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:462px;height:362px;" version="1.1" viewBox="0 0 462 362" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f6iprptcox9z5" 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></defs><g><!--MD5=[beff0c4640d168cedf062bb151026421]
+class C_0000000003--><rect fill="#FEFECE" filter="url(#f6iprptcox9z5)" height="73.6094" id="C_0000000003" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="215.5" y="8"/><ellipse cx="269.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M269.8594,19.3438 L268.7031,24.4219 L271.0313,24.4219 L269.8594,19.3438 Z M268.375,17.1094 L271.3594,17.1094 L274.7188,29.5 L272.2656,29.5 L271.5,26.4375 L268.2188,26.4375 L267.4688,29.5 L265.0313,29.5 L268.375,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="290.25" y="28.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="216.5" x2="339.5" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="216.5" x2="339.5" y1="48" y2="48"/><ellipse cx="226.5" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="235.5" y="62.2104">foo_a() = 0 : void</text><ellipse cx="226.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="235.5" y="75.0151">foo_c() = 0 : void</text><!--MD5=[18c047a639bbed34c417ca7fb6966b16]
+class C_0000000005--><rect fill="#FEFECE" filter="url(#f6iprptcox9z5)" height="60.8047" id="C_0000000005" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="297" y="143"/><ellipse cx="339" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.9688,164.6406 Q341.3906,164.9375 340.75,165.0781 Q340.1094,165.2344 339.4063,165.2344 Q336.9063,165.2344 335.5781,163.5938 Q334.2656,161.9375 334.2656,158.8125 Q334.2656,155.6875 335.5781,154.0313 Q336.9063,152.375 339.4063,152.375 Q340.1094,152.375 340.75,152.5313 Q341.4063,152.6875 341.9688,152.9844 L341.9688,155.7031 Q341.3438,155.125 340.75,154.8594 Q340.1563,154.5781 339.5313,154.5781 Q338.1875,154.5781 337.5,155.6563 Q336.8125,156.7188 336.8125,158.8125 Q336.8125,160.9063 337.5,161.9844 Q338.1875,163.0469 339.5313,163.0469 Q340.1563,163.0469 340.75,162.7813 Q341.3438,162.5 341.9688,161.9219 L341.9688,164.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359" y="163.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="396" y1="175" y2="175"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="396" y1="183" y2="183"/><ellipse cx="308" cy="194" 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="74" x="317" y="197.2104">foo_a() : void</text><!--MD5=[818353795a49a6973a503ac8115e4dab]
+class C_0000000007--><rect fill="#FEFECE" filter="url(#f6iprptcox9z5)" height="60.8047" id="C_0000000007" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="162.5" y="143"/><ellipse cx="204.05" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M207.0188,164.6406 Q206.4406,164.9375 205.8,165.0781 Q205.1594,165.2344 204.4563,165.2344 Q201.9563,165.2344 200.6281,163.5938 Q199.3156,161.9375 199.3156,158.8125 Q199.3156,155.6875 200.6281,154.0313 Q201.9563,152.375 204.4563,152.375 Q205.1594,152.375 205.8,152.5313 Q206.4563,152.6875 207.0188,152.9844 L207.0188,155.7031 Q206.3938,155.125 205.8,154.8594 Q205.2063,154.5781 204.5813,154.5781 Q203.2375,154.5781 202.55,155.6563 Q201.8625,156.7188 201.8625,158.8125 Q201.8625,160.9063 202.55,161.9844 Q203.2375,163.0469 204.5813,163.0469 Q205.2063,163.0469 205.8,162.7813 Q206.3938,162.5 207.0188,161.9219 L207.0188,164.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="223.95" y="163.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="260.5" y1="175" y2="175"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="260.5" y1="183" y2="183"/><ellipse cx="173.5" cy="194" 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="73" x="182.5" y="197.2104">foo_c() : void</text><!--MD5=[5c7232b8fb55675cd47ac6bc97042a31]
+class C_0000000009--><rect fill="#FEFECE" filter="url(#f6iprptcox9z5)" height="86.4141" id="C_0000000009" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="276" y="265"/><ellipse cx="339.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M342.2188,286.6406 Q341.6406,286.9375 341,287.0781 Q340.3594,287.2344 339.6563,287.2344 Q337.1563,287.2344 335.8281,285.5938 Q334.5156,283.9375 334.5156,280.8125 Q334.5156,277.6875 335.8281,276.0313 Q337.1563,274.375 339.6563,274.375 Q340.3594,274.375 341,274.5313 Q341.6563,274.6875 342.2188,274.9844 L342.2188,277.7031 Q341.5938,277.125 341,276.8594 Q340.4063,276.5781 339.7813,276.5781 Q338.4375,276.5781 337.75,277.6563 Q337.0625,278.7188 337.0625,280.8125 Q337.0625,282.9063 337.75,283.9844 Q338.4375,285.0469 339.7813,285.0469 Q340.4063,285.0469 341,284.7813 Q341.5938,284.5 342.2188,283.9219 L342.2188,286.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="359.75" y="285.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="419" y1="297" y2="297"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="284" y="305"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="296" y="311.2104">as : std::vector&lt;A*&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="419" y1="317.8047" y2="317.8047"/><ellipse cx="287" cy="328.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="74" x="296" y="332.0151">foo_a() : void</text><ellipse cx="287" cy="341.6094" 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="73" x="296" y="344.8198">foo_c() : void</text><!--MD5=[feece1046a0a11568e7ed8e5f83eb7fa]
+class C_0000000013--><rect fill="#FEFECE" filter="url(#f6iprptcox9z5)" height="86.4141" id="C_0000000013" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="97" y="265"/><ellipse cx="160.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M163.7188,286.6406 Q163.1406,286.9375 162.5,287.0781 Q161.8594,287.2344 161.1563,287.2344 Q158.6563,287.2344 157.3281,285.5938 Q156.0156,283.9375 156.0156,280.8125 Q156.0156,277.6875 157.3281,276.0313 Q158.6563,274.375 161.1563,274.375 Q161.8594,274.375 162.5,274.5313 Q163.1563,274.6875 163.7188,274.9844 L163.7188,277.7031 Q163.0938,277.125 162.5,276.8594 Q161.9063,276.5781 161.2813,276.5781 Q159.9375,276.5781 159.25,277.6563 Q158.5625,278.7188 158.5625,280.8125 Q158.5625,282.9063 159.25,283.9844 Q159.9375,285.0469 161.2813,285.0469 Q161.9063,285.0469 162.5,284.7813 Q163.0938,284.5 163.7188,283.9219 L163.7188,286.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="181.25" y="285.1543">E</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="240" y1="297" y2="297"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="305"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="117" y="311.2104">as : std::vector&lt;A*&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="240" y1="317.8047" y2="317.8047"/><ellipse cx="108" cy="328.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="74" x="117" y="332.0151">foo_a() : void</text><ellipse cx="108" cy="341.6094" 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="73" x="117" y="344.8198">foo_c() : void</text><path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L180,57.6328 A0,0 0 0 0 180,57.6328 L180,50.5 L215.27,45 L180,42.5 L180,42.5 L170,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f6iprptcox9z5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M170,32.5 L170,42.5 L180,42.5 L170,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="153" x="12" y="49.5669">Base abstract interface.</text><!--MD5=[a1441429e3b6b3d08fd42e29dedae775]
+reverse link C_0000000003 to C_0000000005--><path d="M307.52,100.12 C315.47,114.69 323.78,129.93 330.71,142.64 " fill="none" id="C_0000000003&lt;-C_0000000005" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="301.2,103.16,297.77,82.25,313.49,96.46,301.2,103.16" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2ddb6a99ab191184a60ec67a4689c2ac]
+reverse link C_0000000003 to C_0000000007--><path d="M249.76,100.12 C242.16,114.69 234.21,129.93 227.58,142.64 " fill="none" id="C_0000000003&lt;-C_0000000007" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="243.63,96.74,259.09,82.25,256.04,103.22,243.63,96.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[efb07a465b532653dac052b0c49a2572]
+link C_0000000009 to C_0000000003--><path d="M384.94,264.94 C409.83,231.23 434.66,183.11 414,143 C399.25,114.36 371.7,92.31 345.23,76.53 " fill="none" id="C_0000000009-&gt;C_0000000003" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="340.65,73.85,346.4036,81.8435,344.9673,76.372,350.4388,74.9357,340.65,73.85" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="425" y="171.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="435" y="178.0669">as</text><!--MD5=[58f6071ec58e2959b8eabc778f05bc54]
+reverse link C_0000000005 to C_0000000009--><path d="M347.38,224.61 C347.48,237.85 347.59,252.02 347.68,264.8 " fill="none" id="C_0000000005&lt;-C_0000000009" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="340.38,224.29,347.22,204.24,354.38,224.18,340.38,224.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bfd71cc72b82b23fd0a90c63672bb252]
+reverse link C_0000000007 to C_0000000009--><path d="M257.12,218.46 C272.44,233.38 289.51,250.02 304.69,264.8 " fill="none" id="C_0000000007&lt;-C_0000000009" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="251.96,223.21,242.52,204.24,261.73,213.18,251.96,223.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[39d514ec0f8c787e6c6cae4f2c8984fc]
+link C_0000000013 to C_0000000003--><path d="M137.22,264.98 C115.43,230.65 94.09,181.66 116,143 C126.87,123.82 171.06,98.01 210.54,77.83 " fill="none" id="C_0000000013-&gt;C_0000000003" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="215.33,75.4,205.4937,75.8975,210.8694,77.6589,209.108,83.0346,215.33,75.4" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="119" y="171.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="129" y="178.0669">as</text><!--MD5=[defe9a0faaaf0ef793044ae162d676b1]
+reverse link C_0000000005 to C_0000000013--><path d="M290.75,216.37 C270,231.82 246.48,249.32 225.69,264.8 " fill="none" id="C_0000000005&lt;-C_0000000013" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="286.83,210.56,307.05,204.24,295.19,221.79,286.83,210.56" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d6bda47cb1463a19a5378f48f09685bd]
+reverse link C_0000000007 to C_0000000013--><path d="M196.05,223.65 C191.66,237.17 186.94,251.71 182.69,264.8 " fill="none" id="C_0000000007&lt;-C_0000000013" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="189.52,221.1,202.35,204.24,202.83,225.42,189.52,221.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[549c48703a821f53b2a382c7f090f242]
 @startuml
-abstract "A" as C_0000000001
-abstract C_0000000001 {
+
+abstract "A" as C_0000000003
+abstract C_0000000003 {
 {abstract} +foo_a() = 0 : void
 {abstract} +foo_c() = 0 : void
 }
 
-class "B" as C_0000000003
-class C_0000000003 {
-+foo_a() : void
-}
-C_0000000001 <|- - C_0000000003
-
-class "C" as C_0000000005
+class "B" as C_0000000005
 class C_0000000005 {
-+foo_c() : void
++foo_a() : void
 }
-C_0000000001 <|- - C_0000000005
 
-class "D" as C_0000000007
+class "C" as C_0000000007
 class C_0000000007 {
++foo_c() : void
+}
+
+class "D" as C_0000000009
+class C_0000000009 {
 +foo_a() : void
 +foo_c() : void
 -as : std::vector<A*>
 }
+
+class "E" as C_0000000013
+class C_0000000013 {
++foo_a() : void
++foo_c() : void
+-as : std::vector<A*>
+}
+
+C_0000000003 <|- - C_0000000005
 C_0000000003 <|- - C_0000000007
-C_0000000005 <|- - C_0000000007
-
-class "E" as C_0000000011
-class C_0000000011 {
-+foo_a() : void
-+foo_c() : void
--as : std::vector<A*>
-}
-C_0000000003 <|- - C_0000000011
-C_0000000005 <|- - C_0000000011
-
-C_0000000007 - -> C_0000000001 : -as
-C_0000000011 - -> C_0000000001 : -as
-note left of C_0000000001 : Base abstract interface.
+C_0000000009 - -> C_0000000003 : -as
+C_0000000005 <|- - C_0000000009
+C_0000000007 <|- - C_0000000009
+C_0000000013 - -> C_0000000003 : -as
+C_0000000005 <|- - C_0000000013
+C_0000000007 <|- - C_0000000013
+note left of C_0000000003 : Base abstract interface.
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index b5d5c73f..e5fc59cf 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:347px;height:398px;" version="1.1" viewBox="0 0 347 398" width="347px" zoomAndPan="magnify"><defs><filter height="300%" id="f2icgtv446esh" 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></defs><g><!--MD5=[084a9dd5f08a7bdff7aa628c452ad928]
-class C_0000000015--><rect fill="#FEFECE" filter="url(#f2icgtv446esh)" height="380.9219" id="C_0000000015" 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"/><ellipse cx="18" cy="50" 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="113" x="27" y="53.2104">public_member : int</text><ellipse cx="18" cy="62.8047" 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" text-decoration="underline" textLength="77" x="27" y="66.0151">static_int : int</text><ellipse cx="18" cy="75.6094" 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" text-decoration="underline" textLength="149" x="27" y="78.8198">static_const_int : int const</text><ellipse cx="18" cy="88.4141" 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" text-decoration="underline" textLength="206" x="27" y="91.6245">auto_member : unsigned long const</text><polygon fill="none" points="18,96.2188,22,100.2188,18,104.2188,14,100.2188" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="104.4292">protected_member : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="117.2339">private_member : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="27" y="130.0386">a : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="136.6328"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="27" y="142.8433">b : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="149.4375"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="27" y="155.6479">c : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/><ellipse cx="18" cy="173.2422" 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" text-decoration="underline" textLength="50" x="27" y="176.4526">A() : void</text><ellipse cx="18" cy="186.0469" 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" text-decoration="underline" textLength="71" x="27" y="189.2573">A(int i) : void</text><ellipse cx="18" cy="198.8516" 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" text-decoration="underline" textLength="81" x="27" y="202.062">A(A&amp;&amp; ) : void</text><ellipse cx="18" cy="211.6563" 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" text-decoration="underline" textLength="106" x="27" y="214.8667">A(A const&amp; ) : void</text><ellipse cx="18" cy="224.4609" 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" text-decoration="underline" textLength="59" x="27" y="227.6714">~A() : void</text><ellipse cx="18" cy="237.2656" 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="122" x="27" y="240.4761">basic_method() : void</text><ellipse cx="18" cy="250.0703" 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" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text><ellipse cx="18" cy="262.875" 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="158" x="27" y="266.0854">const_method() const : void</text><ellipse cx="18" cy="275.6797" 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="108" x="27" y="278.8901">auto_method() : int</text><ellipse cx="18" cy="288.4844" 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="148" x="27" y="291.6948">double_int(int const i) : int</text><ellipse cx="18" cy="301.2891" 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="259" x="27" y="304.4995">sum(double const a, double const b) : double</text><ellipse cx="18" cy="314.0938" 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="145" x="27" y="317.3042">default_int(int i = 12) : int</text><ellipse cx="18" cy="326.8984" 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="303" x="27" y="330.1089">default_string(int i, std::string s = "abc") : std::string</text><ellipse cx="18" cy="339.7031" 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" text-decoration="underline" textLength="137" x="27" y="342.9136">create_from_int(int i) : A</text><polygon fill="#FFFF44" points="18,347.5078,22,351.5078,18,355.5078,14,351.5078" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="355.7183">protected_method() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="362.3125"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="368.5229">private_method() : void</text><polygon fill="#FFFF44" points="18,373.1172,22,377.1172,18,381.1172,14,377.1172" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="232" x="27" y="381.3276">compare : std::function&lt;bool(int const)&gt;</text><!--MD5=[c62a3c4835c7c6207fba386777bc938b]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:347px;height:398px;" version="1.1" viewBox="0 0 347 398" width="347px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kox1dxktp6lm" 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></defs><g><!--MD5=[f9adcaaea32b87b4363a1941c80885e6]
+class C_0000000019--><rect fill="#FEFECE" filter="url(#f1kox1dxktp6lm)" height="380.9219" id="C_0000000019" 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"/><ellipse cx="18" cy="50" 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="113" x="27" y="53.2104">public_member : int</text><ellipse cx="18" cy="62.8047" 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" text-decoration="underline" textLength="77" x="27" y="66.0151">static_int : int</text><ellipse cx="18" cy="75.6094" 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" text-decoration="underline" textLength="149" x="27" y="78.8198">static_const_int : int const</text><ellipse cx="18" cy="88.4141" 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" text-decoration="underline" textLength="206" x="27" y="91.6245">auto_member : unsigned long const</text><polygon fill="none" points="18,96.2188,22,100.2188,18,104.2188,14,100.2188" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="104.4292">protected_member : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="117.2339">private_member : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="27" y="130.0386">a : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="136.6328"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="27" y="142.8433">b : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="149.4375"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="27" y="155.6479">c : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/><ellipse cx="18" cy="173.2422" 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" text-decoration="underline" textLength="50" x="27" y="176.4526">A() : void</text><ellipse cx="18" cy="186.0469" 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" text-decoration="underline" textLength="71" x="27" y="189.2573">A(int i) : void</text><ellipse cx="18" cy="198.8516" 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" text-decoration="underline" textLength="81" x="27" y="202.062">A(A&amp;&amp; ) : void</text><ellipse cx="18" cy="211.6563" 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" text-decoration="underline" textLength="106" x="27" y="214.8667">A(A const&amp; ) : void</text><ellipse cx="18" cy="224.4609" 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" text-decoration="underline" textLength="59" x="27" y="227.6714">~A() : void</text><ellipse cx="18" cy="237.2656" 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="122" x="27" y="240.4761">basic_method() : void</text><ellipse cx="18" cy="250.0703" 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" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text><ellipse cx="18" cy="262.875" 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="158" x="27" y="266.0854">const_method() const : void</text><ellipse cx="18" cy="275.6797" 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="108" x="27" y="278.8901">auto_method() : int</text><ellipse cx="18" cy="288.4844" 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="148" x="27" y="291.6948">double_int(int const i) : int</text><ellipse cx="18" cy="301.2891" 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="259" x="27" y="304.4995">sum(double const a, double const b) : double</text><ellipse cx="18" cy="314.0938" 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="145" x="27" y="317.3042">default_int(int i = 12) : int</text><ellipse cx="18" cy="326.8984" 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="303" x="27" y="330.1089">default_string(int i, std::string s = "abc") : std::string</text><ellipse cx="18" cy="339.7031" 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" text-decoration="underline" textLength="137" x="27" y="342.9136">create_from_int(int i) : A</text><polygon fill="#FFFF44" points="18,347.5078,22,351.5078,18,355.5078,14,351.5078" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="355.7183">protected_method() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="362.3125"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="368.5229">private_method() : void</text><polygon fill="#FFFF44" points="18,373.1172,22,377.1172,18,381.1172,14,377.1172" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="232" x="27" y="381.3276">compare : std::function&lt;bool(int const)&gt;</text><!--MD5=[8760f10afd07d23e24a9ab071b31de4e]
 @startuml
-class "A" as C_0000000015
-class C_0000000015 {
+
+class "A" as C_0000000019
+class C_0000000019 {
 {static} +A() : void
 {static} +A(int i) : void
 {static} +A(A&& ) : void
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index d57a355a..e673475c 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,36 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="346px" preserveAspectRatio="none" style="width:177px;height:346px;" version="1.1" viewBox="0 0 177 346" width="177px" zoomAndPan="magnify"><defs><filter height="300%" id="f1lp15qfsag4o6" 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></defs><g><!--MD5=[f9adcaaea32b87b4363a1941c80885e6]
-class C_0000000019--><rect fill="#FEFECE" filter="url(#f1lp15qfsag4o6)" height="73.6094" id="C_0000000019" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="25" y="262"/><ellipse cx="81.25" cy="278" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M84.2188,283.6406 Q83.6406,283.9375 83,284.0781 Q82.3594,284.2344 81.6563,284.2344 Q79.1563,284.2344 77.8281,282.5938 Q76.5156,280.9375 76.5156,277.8125 Q76.5156,274.6875 77.8281,273.0313 Q79.1563,271.375 81.6563,271.375 Q82.3594,271.375 83,271.5313 Q83.6563,271.6875 84.2188,271.9844 L84.2188,274.7031 Q83.5938,274.125 83,273.8594 Q82.4063,273.5781 81.7813,273.5781 Q80.4375,273.5781 79.75,274.6563 Q79.0625,275.7188 79.0625,277.8125 Q79.0625,279.9063 79.75,280.9844 Q80.4375,282.0469 81.7813,282.0469 Q82.4063,282.0469 83,281.7813 Q83.5938,281.5 84.2188,280.9219 L84.2188,283.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="101.75" y="282.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="26" x2="153" y1="294" y2="294"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="26" x2="153" y1="302" y2="302"/><ellipse cx="36" cy="313" 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="96" x="45" y="316.2104">foo() const : void</text><ellipse cx="36" cy="325.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="103" x="45" y="329.0151">foo2() const : void</text><!--MD5=[07bf2dc0704a7aa08268ea834afd57a8]
-class C_0000000020--><rect fill="#FEFECE" filter="url(#f1lp15qfsag4o6)" height="48" id="C_0000000020" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="65.5" y="154"/><ellipse cx="80.5" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M83.4688,175.6406 Q82.8906,175.9375 82.25,176.0781 Q81.6094,176.2344 80.9063,176.2344 Q78.4063,176.2344 77.0781,174.5938 Q75.7656,172.9375 75.7656,169.8125 Q75.7656,166.6875 77.0781,165.0313 Q78.4063,163.375 80.9063,163.375 Q81.6094,163.375 82.25,163.5313 Q82.9063,163.6875 83.4688,163.9844 L83.4688,166.7031 Q82.8438,166.125 82.25,165.8594 Q81.6563,165.5781 81.0313,165.5781 Q79.6875,165.5781 79,166.6563 Q78.3125,167.7188 78.3125,169.8125 Q78.3125,171.9063 79,172.9844 Q79.6875,174.0469 81.0313,174.0469 Q81.6563,174.0469 82.25,173.7813 Q82.8438,173.5 83.4688,172.9219 L83.4688,175.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="94.5" y="174.1543">AA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="66.5" x2="112.5" y1="186" y2="186"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="66.5" x2="112.5" y1="194" y2="194"/><!--MD5=[75d5d65ad67f9874a01e87775cdeb6cf]
-class C_0000000021--><rect fill="#FEFECE" filter="url(#f1lp15qfsag4o6)" height="86.4141" id="C_0000000021" style="stroke: #A80036; stroke-width: 1.5;" width="69" 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="37" x="35" y="28.1543">Lights</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="40" y2="40"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="12" y="54.2104">Green</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="12" y="67.0151">Yellow</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="12" y="79.8198">Red</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="86.4141" y2="86.4141"/><!--MD5=[8447778bb04d7edc6eb68a2c4932b879]
-class C_0000000023--><rect fill="#FEFECE" filter="url(#f1lp15qfsag4o6)" height="48" id="C_0000000023" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="110.5" y="27"/><ellipse cx="125.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M128.4688,48.6406 Q127.8906,48.9375 127.25,49.0781 Q126.6094,49.2344 125.9063,49.2344 Q123.4063,49.2344 122.0781,47.5938 Q120.7656,45.9375 120.7656,42.8125 Q120.7656,39.6875 122.0781,38.0313 Q123.4063,36.375 125.9063,36.375 Q126.6094,36.375 127.25,36.5313 Q127.9063,36.6875 128.4688,36.9844 L128.4688,39.7031 Q127.8438,39.125 127.25,38.8594 Q126.6563,38.5781 126.0313,38.5781 Q124.6875,38.5781 124,39.6563 Q123.3125,40.7188 123.3125,42.8125 Q123.3125,44.9063 124,45.9844 Q124.6875,47.0469 126.0313,47.0469 Q126.6563,47.0469 127.25,46.7813 Q127.8438,46.5 128.4688,45.9219 L128.4688,48.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="139.5" y="47.1543">AAA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="111.5" x2="165.5" y1="59" y2="59"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="111.5" x2="165.5" y1="67" y2="67"/><!--MD5=[efbb7ed2295198ac743a6ef6c11b34b0]
-link C_0000000020 to C_0000000019--><path d="M89.5,202.23 C89.5,214.91 89.5,231.15 89.5,246.64 " fill="none" id="C_0000000020-&gt;C_0000000019" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="89.5" cy="253.71" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="89.5" x2="89.5" y1="245.71" y2="261.71"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="97.5" x2="81.5" y1="253.71" y2="253.71"/><!--MD5=[4a8c4b7e77cc12abf7a3516da30291b8]
-link C_0000000021 to C_0000000020--><path d="M57.09,94.32 C62.8,108.88 69.15,125.08 74.71,139.26 " fill="none" id="C_0000000021-&gt;C_0000000020" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="77.4428" cy="146.2208" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="74.5256" x2="80.36" y1="138.7717" y2="153.67"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="84.892" x2="69.9936" y1="143.3036" y2="149.138"/><!--MD5=[e29b9dd51419427a9277e238b3e921d6]
-link C_0000000023 to C_0000000020--><path d="M129.4,75.22 C122.32,93.29 112.35,118.72 104.15,139.64 " fill="none" id="C_0000000023-&gt;C_0000000020" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="101.4738" cy="146.4634" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="104.3976" x2="98.55" y1="139.0169" y2="153.91"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="108.9204" x2="94.0272" y1="149.3872" y2="143.5396"/><!--MD5=[639af77e4c3a727442ddae2778c11e57]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="346px" preserveAspectRatio="none" style="width:177px;height:346px;" version="1.1" viewBox="0 0 177 346" width="177px" zoomAndPan="magnify"><defs><filter height="300%" id="flt4sl16m6732" 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></defs><g><!--MD5=[4f54760dc846aaaf4a5290a106df8a28]
+class C_0000000025--><rect fill="#FEFECE" filter="url(#flt4sl16m6732)" height="73.6094" id="C_0000000025" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="25" y="262"/><ellipse cx="81.25" cy="278" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M84.2188,283.6406 Q83.6406,283.9375 83,284.0781 Q82.3594,284.2344 81.6563,284.2344 Q79.1563,284.2344 77.8281,282.5938 Q76.5156,280.9375 76.5156,277.8125 Q76.5156,274.6875 77.8281,273.0313 Q79.1563,271.375 81.6563,271.375 Q82.3594,271.375 83,271.5313 Q83.6563,271.6875 84.2188,271.9844 L84.2188,274.7031 Q83.5938,274.125 83,273.8594 Q82.4063,273.5781 81.7813,273.5781 Q80.4375,273.5781 79.75,274.6563 Q79.0625,275.7188 79.0625,277.8125 Q79.0625,279.9063 79.75,280.9844 Q80.4375,282.0469 81.7813,282.0469 Q82.4063,282.0469 83,281.7813 Q83.5938,281.5 84.2188,280.9219 L84.2188,283.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="101.75" y="282.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="26" x2="153" y1="294" y2="294"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="26" x2="153" y1="302" y2="302"/><ellipse cx="36" cy="313" 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="96" x="45" y="316.2104">foo() const : void</text><ellipse cx="36" cy="325.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="103" x="45" y="329.0151">foo2() const : void</text><!--MD5=[723737d08fd08d9e93b95825543e028b]
+class C_0000000026--><rect fill="#FEFECE" filter="url(#flt4sl16m6732)" height="48" id="C_0000000026" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="65.5" y="154"/><ellipse cx="80.5" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M83.4688,175.6406 Q82.8906,175.9375 82.25,176.0781 Q81.6094,176.2344 80.9063,176.2344 Q78.4063,176.2344 77.0781,174.5938 Q75.7656,172.9375 75.7656,169.8125 Q75.7656,166.6875 77.0781,165.0313 Q78.4063,163.375 80.9063,163.375 Q81.6094,163.375 82.25,163.5313 Q82.9063,163.6875 83.4688,163.9844 L83.4688,166.7031 Q82.8438,166.125 82.25,165.8594 Q81.6563,165.5781 81.0313,165.5781 Q79.6875,165.5781 79,166.6563 Q78.3125,167.7188 78.3125,169.8125 Q78.3125,171.9063 79,172.9844 Q79.6875,174.0469 81.0313,174.0469 Q81.6563,174.0469 82.25,173.7813 Q82.8438,173.5 83.4688,172.9219 L83.4688,175.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="94.5" y="174.1543">AA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="66.5" x2="112.5" y1="186" y2="186"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="66.5" x2="112.5" y1="194" y2="194"/><!--MD5=[1bd8d061b59c0a8912de08e764be36d6]
+class C_0000000027--><rect fill="#FEFECE" filter="url(#flt4sl16m6732)" height="86.4141" id="C_0000000027" style="stroke: #A80036; stroke-width: 1.5;" width="69" 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="37" x="35" y="28.1543">Lights</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="40" y2="40"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="12" y="54.2104">Green</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="12" y="67.0151">Yellow</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="12" y="79.8198">Red</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="86.4141" y2="86.4141"/><!--MD5=[068fff4ca6ee310a342392b590ab8e20]
+class C_0000000029--><rect fill="#FEFECE" filter="url(#flt4sl16m6732)" height="48" id="C_0000000029" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="110.5" y="27"/><ellipse cx="125.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M128.4688,48.6406 Q127.8906,48.9375 127.25,49.0781 Q126.6094,49.2344 125.9063,49.2344 Q123.4063,49.2344 122.0781,47.5938 Q120.7656,45.9375 120.7656,42.8125 Q120.7656,39.6875 122.0781,38.0313 Q123.4063,36.375 125.9063,36.375 Q126.6094,36.375 127.25,36.5313 Q127.9063,36.6875 128.4688,36.9844 L128.4688,39.7031 Q127.8438,39.125 127.25,38.8594 Q126.6563,38.5781 126.0313,38.5781 Q124.6875,38.5781 124,39.6563 Q123.3125,40.7188 123.3125,42.8125 Q123.3125,44.9063 124,45.9844 Q124.6875,47.0469 126.0313,47.0469 Q126.6563,47.0469 127.25,46.7813 Q127.8438,46.5 128.4688,45.9219 L128.4688,48.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="139.5" y="47.1543">AAA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="111.5" x2="165.5" y1="59" y2="59"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="111.5" x2="165.5" y1="67" y2="67"/><!--MD5=[d1aa82cbe2493da6f6c526a60cf70b67]
+link C_0000000026 to C_0000000025--><path d="M89.5,202.23 C89.5,214.91 89.5,231.15 89.5,246.64 " fill="none" id="C_0000000026-&gt;C_0000000025" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="89.5" cy="253.71" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="89.5" x2="89.5" y1="245.71" y2="261.71"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="97.5" x2="81.5" y1="253.71" y2="253.71"/><!--MD5=[3097c151f5fb43181bf04b39060ba49d]
+link C_0000000027 to C_0000000026--><path d="M57.09,94.32 C62.8,108.88 69.15,125.08 74.71,139.26 " fill="none" id="C_0000000027-&gt;C_0000000026" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="77.4428" cy="146.2208" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="74.5256" x2="80.36" y1="138.7717" y2="153.67"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="84.892" x2="69.9936" y1="143.3036" y2="149.138"/><!--MD5=[9c465f11530af54a349ba48166affe68]
+link C_0000000029 to C_0000000026--><path d="M129.4,75.22 C122.32,93.29 112.35,118.72 104.15,139.64 " fill="none" id="C_0000000029-&gt;C_0000000026" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="101.4738" cy="146.4634" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="104.3976" x2="98.55" y1="139.0169" y2="153.91"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="108.9204" x2="94.0272" y1="149.3872" y2="143.5396"/><!--MD5=[304027c9dc0b2b320421bb5495cf241d]
 @startuml
-class "A" as C_0000000019
-class C_0000000019 {
+
+class "A" as C_0000000025
+class C_0000000025 {
 +foo() const : void
 +foo2() const : void
 }
 
-class "AA" as C_0000000020
-class C_0000000020 {
+class "AA" as C_0000000026
+class C_0000000026 {
 }
 
-enum "Lights" as C_0000000021
-enum C_0000000021 {
+enum "Lights" as C_0000000027
+enum C_0000000027 {
 Green
 Yellow
 Red
 }
 
-class "AAA" as C_0000000023
-class C_0000000023 {
+class "AAA" as C_0000000029
+class C_0000000029 {
 }
 
-C_0000000020 - -+ C_0000000019
-C_0000000021 - -+ C_0000000020
-C_0000000023 - -+ C_0000000020
+C_0000000026 - -+ C_0000000025
+C_0000000027 - -+ C_0000000026
+C_0000000029 - -+ C_0000000026
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index 1b20997b..6e548328 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,74 +1,75 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f18bviiaoxm3dl" 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></defs><g><!--MD5=[1bd8d061b59c0a8912de08e764be36d6]
-class C_0000000027--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000027" 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"/><!--MD5=[068fff4ca6ee310a342392b590ab8e20]
-class C_0000000029--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000029" 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"/><!--MD5=[63d4d5f3e9e55f6b5b51902261063d40]
-class C_0000000031--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000031" 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"/><!--MD5=[34bf2f037a03f8b6398523d0e1999f50]
-class C_0000000033--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000033" 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"/><!--MD5=[4f6897ba752c61dcba78f858a75bd388]
-class C_0000000035--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000035" 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"/><!--MD5=[33e3026205124fac5f12467c5074e37f]
-class C_0000000037--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000037" 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"/><!--MD5=[4b85799aaed965322344b72821bbf2e9]
-class C_0000000039--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000039" 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"/><!--MD5=[b73fdbda0e7991d72d1fb853535a2f28]
-class C_0000000041--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000041" 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"/><!--MD5=[ce8be31c766cce6bfc2286de37f25143]
-class C_0000000043--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000043" 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"/><!--MD5=[3454e611ef6b1cdda346145a9031d850]
-class C_0000000045--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000045" 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"/><!--MD5=[273c990b1ecb7a177de2ffd7335c476a]
-class C_0000000047--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="48" id="C_0000000047" 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"/><!--MD5=[0365182f62eebca002cc644d9a6c449f]
-class C_0000000049--><rect fill="#FEFECE" filter="url(#f18bviiaoxm3dl)" height="240.0703" id="C_0000000049" style="stroke: #A80036; stroke-width: 1.5;" width="208" x="299" 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="300" x2="506" y1="40" y2="40"/><ellipse cx="310" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="319" y="54.2104">some_int : int</text><ellipse cx="310" cy="63.8047" 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="130" x="319" y="67.0151">some_int_pointer : int*</text><ellipse cx="310" cy="76.6094" 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="182" x="319" y="79.8198">some_int_pointer_pointer : int**</text><ellipse cx="310" cy="89.4141" 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="149" x="319" y="92.6245">some_int_reference : int&amp;</text><ellipse cx="310" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="319" y="105.4292">a : A</text><ellipse cx="310" cy="115.0234" 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="33" x="319" y="118.2339">b : B*</text><ellipse cx="310" cy="127.8281" 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="36" x="319" y="131.0386">c : C&amp;</text><ellipse cx="310" cy="140.6328" 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="68" x="319" y="143.8433">d : D const*</text><ellipse cx="310" cy="153.4375" 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="71" x="319" y="156.6479">e : E const&amp;</text><ellipse cx="310" cy="166.2422" 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="42" x="319" y="169.4526">f : F&amp;&amp;</text><ellipse cx="310" cy="179.0469" 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="40" x="319" y="182.2573">g : G**</text><ellipse cx="310" cy="191.8516" 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="45" x="319" y="195.062">h : H***</text><ellipse cx="310" cy="204.6563" 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="34" x="319" y="207.8667">i : I*&amp;</text><ellipse cx="310" cy="217.4609" 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="68" x="319" y="220.6714">j : J volatile*</text><ellipse cx="310" cy="230.2656" 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="31" x="319" y="233.4761">k : K*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="300" x2="506" y1="240.0703" y2="240.0703"/><!--MD5=[66aa2b8fb7b76392cfa0a23b3cbe0106]
-reverse link C_0000000049 to C_0000000027--><path d="M287.01,194.6 C221.02,232.23 137.03,280.67 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000000049&lt;-C_0000000027" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="298.69,187.94,291.4965,187.437,288.2654,193.8837,295.4589,194.3867,298.69,187.94" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="139" y="291.0669">+a</text><!--MD5=[d6453ec5980def4a178fd6fd09f7bb45]
-link C_0000000049 to C_0000000029--><path d="M298.65,204.67 C236.55,249.7 162.79,303.19 125.38,330.32 " fill="none" id="C_0000000049-&gt;C_0000000029" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="121,333.5,130.6339,331.4535,125.0474,330.5642,125.9367,324.9777,121,333.5" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="192" y="291.0669">+b</text><!--MD5=[5012642ecd55810960f68ff2f4fc591b]
-link C_0000000049 to C_0000000031--><path d="M298.8,229.53 C261.85,265.18 223.57,302.1 199.78,325.05 " fill="none" id="C_0000000049-&gt;C_0000000031" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="196.09,328.62,205.3384,325.2338,199.6823,325.1422,199.7739,319.4861,196.09,328.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="245" y="291.0669">+c</text><!--MD5=[6e1713d85015d071d2770e50cc827966]
-link C_0000000049 to C_0000000033--><path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0000000049-&gt;C_0000000033" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="268.03,324.75,276.4249,319.5997,270.8626,320.6298,269.8326,315.0675,268.03,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="298" y="291.0669">+d</text><!--MD5=[8d4de26b8a282ed14513dc935a9682a6]
-link C_0000000049 to C_0000000035--><path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0000000049-&gt;C_0000000035" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="335.96,324.75,342.6532,317.525,337.5754,320.0181,335.0822,314.9403,335.96,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="352" y="291.0669">+e</text><!--MD5=[708a6d9808da5945aa72d6b3797de71e]
-reverse link C_0000000049 to C_0000000037--><path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0000000049&lt;-C_0000000037" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="403,248.11,399,254.11,403,260.11,407,254.11,403,248.11" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="404" y="291.0669">+f</text><!--MD5=[366015ed0584b986d8bdf69d336917cb]
-link C_0000000049 to C_0000000039--><path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0000000049-&gt;C_0000000039" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="470.04,324.75,470.9178,314.9403,468.4246,320.0181,463.3468,317.525,470.04,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="459" y="291.0669">+g</text><!--MD5=[bd935c97ae4e313a896700ea4fff74d7]
-link C_0000000049 to C_0000000041--><path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0000000049-&gt;C_0000000041" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="537.97,324.75,536.1674,315.0675,535.1374,320.6298,529.5751,319.5997,537.97,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="515" y="291.0669">+h</text><!--MD5=[eec4922dd1a31b1b090ce6151922065f]
-link C_0000000049 to C_0000000043--><path d="M507.13,230.81 C544.28,267.13 582.6,304.59 605.61,327.09 " fill="none" id="C_0000000049-&gt;C_0000000043" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="609.45,330.84,605.8031,321.6912,605.8718,327.3477,600.2154,327.4164,609.45,330.84" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="568" y="291.0669">+i</text><!--MD5=[3ec4f963adbbce57917edb3ef3a30b10]
-link C_0000000049 to C_0000000045--><path d="M507.07,206.52 C568.18,252.04 640.14,305.65 675.37,331.89 " fill="none" id="C_0000000049-&gt;C_0000000045" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="679.48,334.95,674.6603,326.361,675.4731,331.9592,669.875,332.772,679.48,334.95" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="620" y="291.0669">+j</text><!--MD5=[927fc958ec01951819e52143e2b51e7a]
-link C_0000000049 to C_0000000047--><path d="M507.02,190.29 C571.9,228.69 657.03,279.37 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0000000049-&gt;C_0000000047" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="749.46,335.76,743.9036,327.6282,745.2056,333.1331,739.7007,334.4352,749.46,335.76" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="680" y="291.0669">+k</text><!--MD5=[fa49f4992973f75da4dd4376a27fce9e]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f8sq8680xn9h8" 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></defs><g><!--MD5=[4f6897ba752c61dcba78f858a75bd388]
+class C_0000000035--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000035" 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"/><!--MD5=[33e3026205124fac5f12467c5074e37f]
+class C_0000000037--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000037" 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"/><!--MD5=[4b85799aaed965322344b72821bbf2e9]
+class C_0000000039--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000039" 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"/><!--MD5=[b73fdbda0e7991d72d1fb853535a2f28]
+class C_0000000041--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000041" 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"/><!--MD5=[ce8be31c766cce6bfc2286de37f25143]
+class C_0000000043--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000043" 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"/><!--MD5=[3454e611ef6b1cdda346145a9031d850]
+class C_0000000045--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000045" 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"/><!--MD5=[273c990b1ecb7a177de2ffd7335c476a]
+class C_0000000047--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000047" 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"/><!--MD5=[0365182f62eebca002cc644d9a6c449f]
+class C_0000000049--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000049" 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"/><!--MD5=[cd66da18075da90dda89dbf60be15dd2]
+class C_0000000051--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000051" 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"/><!--MD5=[2b0c425f3ee43c0f197849f11aa01cb5]
+class C_0000000053--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000053" 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"/><!--MD5=[82138fb2270ce3b31e23cd60e0f83c8b]
+class C_0000000055--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="48" id="C_0000000055" 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"/><!--MD5=[80bed2b7e37c5ecf7337cf4be059b5ba]
+class C_0000000057--><rect fill="#FEFECE" filter="url(#f8sq8680xn9h8)" height="240.0703" id="C_0000000057" style="stroke: #A80036; stroke-width: 1.5;" width="208" x="299" 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="300" x2="506" y1="40" y2="40"/><ellipse cx="310" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="319" y="54.2104">some_int : int</text><ellipse cx="310" cy="63.8047" 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="130" x="319" y="67.0151">some_int_pointer : int*</text><ellipse cx="310" cy="76.6094" 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="182" x="319" y="79.8198">some_int_pointer_pointer : int**</text><ellipse cx="310" cy="89.4141" 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="149" x="319" y="92.6245">some_int_reference : int&amp;</text><ellipse cx="310" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="319" y="105.4292">a : A</text><ellipse cx="310" cy="115.0234" 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="33" x="319" y="118.2339">b : B*</text><ellipse cx="310" cy="127.8281" 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="36" x="319" y="131.0386">c : C&amp;</text><ellipse cx="310" cy="140.6328" 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="68" x="319" y="143.8433">d : D const*</text><ellipse cx="310" cy="153.4375" 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="71" x="319" y="156.6479">e : E const&amp;</text><ellipse cx="310" cy="166.2422" 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="42" x="319" y="169.4526">f : F&amp;&amp;</text><ellipse cx="310" cy="179.0469" 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="40" x="319" y="182.2573">g : G**</text><ellipse cx="310" cy="191.8516" 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="45" x="319" y="195.062">h : H***</text><ellipse cx="310" cy="204.6563" 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="34" x="319" y="207.8667">i : I*&amp;</text><ellipse cx="310" cy="217.4609" 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="68" x="319" y="220.6714">j : J volatile*</text><ellipse cx="310" cy="230.2656" 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="31" x="319" y="233.4761">k : K*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="300" x2="506" y1="240.0703" y2="240.0703"/><!--MD5=[7de0338547d320bb03f63cf5d7dc317c]
+reverse link C_0000000057 to C_0000000035--><path d="M287.01,194.6 C221.02,232.23 137.03,280.67 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000000057&lt;-C_0000000035" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="298.69,187.94,291.4965,187.437,288.2654,193.8837,295.4589,194.3867,298.69,187.94" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="139" y="291.0669">+a</text><!--MD5=[e41e8fc144a73c21ceb76ad035934792]
+link C_0000000057 to C_0000000037--><path d="M298.65,204.67 C236.55,249.7 162.79,303.19 125.38,330.32 " fill="none" id="C_0000000057-&gt;C_0000000037" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="121,333.5,130.6339,331.4535,125.0474,330.5642,125.9367,324.9777,121,333.5" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="192" y="291.0669">+b</text><!--MD5=[24c32689182a8058d0c17005b898e045]
+link C_0000000057 to C_0000000039--><path d="M298.8,229.53 C261.85,265.18 223.57,302.1 199.78,325.05 " fill="none" id="C_0000000057-&gt;C_0000000039" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="196.09,328.62,205.3384,325.2338,199.6823,325.1422,199.7739,319.4861,196.09,328.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="245" y="291.0669">+c</text><!--MD5=[6492c0e82d46ec12d99919aa3865c8ec]
+link C_0000000057 to C_0000000041--><path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0000000057-&gt;C_0000000041" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="268.03,324.75,276.4249,319.5997,270.8626,320.6298,269.8326,315.0675,268.03,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="298" y="291.0669">+d</text><!--MD5=[d0846b721eab238058460166c321c343]
+link C_0000000057 to C_0000000043--><path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0000000057-&gt;C_0000000043" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="335.96,324.75,342.6532,317.525,337.5754,320.0181,335.0822,314.9403,335.96,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="352" y="291.0669">+e</text><!--MD5=[96a626c10e61d239d6c3003909bfd86d]
+reverse link C_0000000057 to C_0000000045--><path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0000000057&lt;-C_0000000045" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="403,248.11,399,254.11,403,260.11,407,254.11,403,248.11" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="404" y="291.0669">+f</text><!--MD5=[4688319bd0d093f3b73e576835a8ad35]
+link C_0000000057 to C_0000000047--><path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0000000057-&gt;C_0000000047" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="470.04,324.75,470.9178,314.9403,468.4246,320.0181,463.3468,317.525,470.04,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="459" y="291.0669">+g</text><!--MD5=[adbf5370cddd0a3b824146f526553602]
+link C_0000000057 to C_0000000049--><path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0000000057-&gt;C_0000000049" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="537.97,324.75,536.1674,315.0675,535.1374,320.6298,529.5751,319.5997,537.97,324.75" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="515" y="291.0669">+h</text><!--MD5=[a9a954e32d42f3d11437ddd6f0d016d3]
+link C_0000000057 to C_0000000051--><path d="M507.13,230.81 C544.28,267.13 582.6,304.59 605.61,327.09 " fill="none" id="C_0000000057-&gt;C_0000000051" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="609.45,330.84,605.8031,321.6912,605.8718,327.3477,600.2154,327.4164,609.45,330.84" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="568" y="291.0669">+i</text><!--MD5=[0f982b23b126c6035a276f42c8dbb298]
+link C_0000000057 to C_0000000053--><path d="M507.07,206.52 C568.18,252.04 640.14,305.65 675.37,331.89 " fill="none" id="C_0000000057-&gt;C_0000000053" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="679.48,334.95,674.6603,326.361,675.4731,331.9592,669.875,332.772,679.48,334.95" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="620" y="291.0669">+j</text><!--MD5=[fb063fea6b194aba48f8ecebcedaed2a]
+link C_0000000057 to C_0000000055--><path d="M507.02,190.29 C571.9,228.69 657.03,279.37 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0000000057-&gt;C_0000000055" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="749.46,335.76,743.9036,327.6282,745.2056,333.1331,739.7007,334.4352,749.46,335.76" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="680" y="291.0669">+k</text><!--MD5=[d7346bb5509764db5c8adcdf57a19f7f]
 @startuml
-class "A" as C_0000000027
-class C_0000000027 {
-}
 
-class "B" as C_0000000029
-class C_0000000029 {
-}
-
-class "C" as C_0000000031
-class C_0000000031 {
-}
-
-class "D" as C_0000000033
-class C_0000000033 {
-}
-
-class "E" as C_0000000035
+class "A" as C_0000000035
 class C_0000000035 {
 }
 
-class "F" as C_0000000037
+class "B" as C_0000000037
 class C_0000000037 {
 }
 
-class "G" as C_0000000039
+class "C" as C_0000000039
 class C_0000000039 {
 }
 
-class "H" as C_0000000041
+class "D" as C_0000000041
 class C_0000000041 {
 }
 
-class "I" as C_0000000043
+class "E" as C_0000000043
 class C_0000000043 {
 }
 
-class "J" as C_0000000045
+class "F" as C_0000000045
 class C_0000000045 {
 }
 
-class "K" as C_0000000047
+class "G" as C_0000000047
 class C_0000000047 {
 }
 
-class "R" as C_0000000049
+class "H" as C_0000000049
 class C_0000000049 {
+}
+
+class "I" as C_0000000051
+class C_0000000051 {
+}
+
+class "J" as C_0000000053
+class C_0000000053 {
+}
+
+class "K" as C_0000000055
+class C_0000000055 {
+}
+
+class "R" as C_0000000057
+class C_0000000057 {
 +some_int : int
 +some_int_pointer : int*
 +some_int_pointer_pointer : int**
@@ -86,17 +87,17 @@ class C_0000000049 {
 +k : K*
 }
 
-C_0000000049 o- - C_0000000027 : +a
-C_0000000049 - -> C_0000000029 : +b
-C_0000000049 - -> C_0000000031 : +c
-C_0000000049 - -> C_0000000033 : +d
-C_0000000049 - -> C_0000000035 : +e
-C_0000000049 o- - C_0000000037 : +f
-C_0000000049 - -> C_0000000039 : +g
-C_0000000049 - -> C_0000000041 : +h
-C_0000000049 - -> C_0000000043 : +i
-C_0000000049 - -> C_0000000045 : +j
-C_0000000049 - -> C_0000000047 : +k
+C_0000000057 o- - C_0000000035 : +a
+C_0000000057 - -> C_0000000037 : +b
+C_0000000057 - -> C_0000000039 : +c
+C_0000000057 - -> C_0000000041 : +d
+C_0000000057 - -> C_0000000043 : +e
+C_0000000057 o- - C_0000000045 : +f
+C_0000000057 - -> C_0000000047 : +g
+C_0000000057 - -> C_0000000049 : +h
+C_0000000057 - -> C_0000000051 : +i
+C_0000000057 - -> C_0000000053 : +j
+C_0000000057 - -> C_0000000055 : +k
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 86934139..cc402db1 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,117 +1,118 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1maghrug2wr79" 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></defs><g><!--MD5=[cd66da18075da90dda89dbf60be15dd2]
-class C_0000000051--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000051" 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"/><!--MD5=[2b0c425f3ee43c0f197849f11aa01cb5]
-class C_0000000053--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000053" 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"/><!--MD5=[82138fb2270ce3b31e23cd60e0f83c8b]
-class C_0000000055--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000055" 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"/><!--MD5=[80bed2b7e37c5ecf7337cf4be059b5ba]
-class C_0000000057--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000057" 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"/><!--MD5=[8e7ad9ab69880e3c51f5680e22fad78e]
-class C_0000000059--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000059" 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"/><!--MD5=[66e740d0519b81a2275b4750257d4223]
-class C_0000000061--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000061" 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"/><!--MD5=[14b0f87ef469862b7dc851f400a41e7e]
-class C_0000000063--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000063" 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"/><!--MD5=[279d9d1e3088b487a0608dbc542bed8b]
-class C_0000000065--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000065" 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"/><!--MD5=[bd47d4af8f4577ac393e0572782dd7d1]
-class C_0000000067--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000067" 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"/><!--MD5=[531da34c930bd145c0fb4d43bbb1d8da]
-class C_0000000069--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000069" 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"/><!--MD5=[4276014d8ec8b7d2346c77463b869a1c]
-class C_0000000071--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000071" 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"/><!--MD5=[050374a9022b4d5f3b555580b54369e9]
-class C_0000000073--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000073" 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"/><!--MD5=[f413d1978815ccf9618e7c3db37c889a]
-class C_0000000075--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000075" 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"/><!--MD5=[555b25aa12d53462f58eba69dea5affc]
-class C_0000000077--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000077" 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"/><!--MD5=[2797d73fa10330f33f6a9ebb1f3e62b0]
-class C_0000000079--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000079" 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"/><!--MD5=[a41028ea3d32da8f1e732d0ceef5684e]
-class C_0000000081--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000081" 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"/><!--MD5=[1da358a7dd77cd262f0d80fd4b9b2874]
-class C_0000000083--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="60.8047" id="C_0000000083" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1370.5" y="405"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1371.5" y="417.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/><ellipse cx="1232.5" cy="451" 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="123" x="1241.5" y="454.2104">data : std::vector&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="460.8047" y2="460.8047"/><!--MD5=[464dccf71dc2f32aa221a2a205ac7d75]
-class C_0000000092--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="48" id="C_0000000092" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="1304" y="296"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="1305" y="308.1387">E</text><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"/><!--MD5=[ef6c0e414c886dba2242a646688caca0]
-class C_0000000087--><rect fill="#FEFECE" filter="url(#f1maghrug2wr79)" height="214.4609" id="C_0000000087" style="stroke: #A80036; stroke-width: 1.5;" width="226" x="473" 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="474" x2="698" y1="40" y2="40"/><ellipse cx="484" cy="51" 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="105" x="493" y="54.2104">a : std::vector&lt;A&gt;</text><ellipse cx="484" cy="63.8047" 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="112" x="493" y="67.0151">b : std::vector&lt;B*&gt;</text><ellipse cx="484" cy="76.6094" 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="113" x="493" y="79.8198">c : std::map&lt;int,C&gt;</text><ellipse cx="484" cy="89.4141" 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="120" x="493" y="92.6245">d : std::map&lt;int,D*&gt;</text><ellipse cx="484" cy="102.2188" 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="145" x="493" y="105.4292">e : custom_container&lt;E&gt;</text><ellipse cx="484" cy="115.0234" 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="180" x="493" y="118.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text><ellipse cx="484" cy="127.8281" 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="200" x="493" y="131.0386">g : std::map&lt;int,std::vector&lt;G*&gt;&gt;</text><ellipse cx="484" cy="140.6328" 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="119" x="493" y="143.8433">h : std::array&lt;H,10&gt;</text><ellipse cx="484" cy="153.4375" 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="109" x="493" y="156.6479">i : std::array&lt;I*,5&gt;</text><ellipse cx="484" cy="166.2422" 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="40" x="493" y="169.4526">j : J[10]</text><ellipse cx="484" cy="179.0469" 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="53" x="493" y="182.2573">k : K*[20]</text><ellipse cx="484" cy="191.8516" 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="190" x="493" y="195.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text><ellipse cx="484" cy="204.6563" 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="154" x="493" y="207.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="474" x2="698" y1="214.4609" y2="214.4609"/><!--MD5=[2ee8919ff64e9123b53f3e930bd4ff69]
-link C_0000000092 to C_0000000059--><path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000000092-&gt;C_0000000059" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1179.7,414.29,1187.7242,408.5793,1182.2451,409.9862,1180.8381,404.5071,1179.7,414.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[574008f930e00b1adaf9b930b14e2550]
-link C_0000000092 to C_0000000083--><path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000000092-&gt;C_0000000083" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1277.73,387,1281.73,407.81,1265.63,394.03,1277.73,387" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3681afa7704fc9a5e5049d50e7ea3c1d]
-reverse link C_0000000087 to C_0000000051--><path d="M460.02,154.89 C378.23,180.82 269.63,216.55 175,252 C124.45,270.94 110.96,274.23 63,299 C57.36,301.92 51.43,305.39 46.02,308.75 " fill="none" id="C_0000000087&lt;-C_0000000051" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.66,150.89,465.7321,148.8889,461.2204,154.5143,468.1483,156.5153,472.66,150.89" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="176" y="265.0669">+a</text><!--MD5=[b459c9bc0de9ca16f83efdb177e95a64]
-link C_0000000087 to C_0000000053--><path d="M472.71,160.05 C406.16,186.21 320.54,220.36 245,252 C197.09,272.07 183.95,274.78 138,299 C133.87,301.18 129.59,303.64 125.46,306.12 " fill="none" id="C_0000000087-&gt;C_0000000053" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="121.05,308.82,130.8145,307.5335,125.3146,306.2099,126.6383,300.71,121.05,308.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="246" y="265.0669">+b</text><!--MD5=[c30149a64c8f1381863a61b63f614d3c]
-reverse link C_0000000087 to C_0000000055--><path d="M460.81,174.23 C387.99,208.94 294.89,254.73 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0000000087&lt;-C_0000000055" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.78,168.54,465.6431,167.5085,461.9459,173.6997,469.0829,174.7312,472.78,168.54" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="296" y="265.0669">+c</text><!--MD5=[7b3afa581ba11060c5bdefa24f94bfcf]
-link C_0000000087 to C_0000000057--><path d="M472.92,185.74 C402.62,229.1 318.04,281.27 276.91,306.64 " fill="none" id="C_0000000087-&gt;C_0000000057" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="272.59,309.3,282.3493,307.9752,276.8444,306.6731,278.1464,301.1682,272.59,309.3" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="362" y="265.0669">+d</text><!--MD5=[1c5eeca5c788d64e640c0cbf17f55aa8]
-reverse link C_0000000087 to C_0000000092--><path d="M712.01,154.98 C798.71,181.93 916.45,218.76 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0000000087&lt;-C_0000000092" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.45,151.08,703.993,156.6801,710.9096,154.6405,706.3666,149.0404,699.45,151.08" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="1068" y="265.0669">+e</text><!--MD5=[42196312b113fd62f60ad7a29727dd3b]
-reverse link C_0000000087 to C_0000000061--><path d="M462.35,214.35 C417.62,249.92 371.97,286.24 346.77,306.27 " fill="none" id="C_0000000087&lt;-C_0000000061" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.78,206.05,465.5941,206.6525,463.3865,213.5173,470.5723,212.9149,472.78,206.05" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="412" y="265.0669">+f</text><!--MD5=[862063a55015ddc47554c5521408231d]
-link C_0000000087 to C_0000000063--><path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0000000087-&gt;C_0000000063" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="422.7,298.82,431.6776,294.7699,426.0298,295.0901,425.7097,289.4423,422.7,298.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="463" y="265.0669">+g</text><!--MD5=[afe76b0bd0cd5f084817c52b30af442d]
-reverse link C_0000000087 to C_0000000065--><path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0000000087&lt;-C_0000000065" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="530.42,222.02,524.0933,225.4801,524.8539,232.651,531.1806,229.1909,530.42,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="514" y="265.0669">+h</text><!--MD5=[015abdf7f543cec83e8d3662f0bcb070]
-link C_0000000087 to C_0000000067--><path d="M567.07,222.13 C565.33,232.23 563.62,242.3 562,252 C559.7,265.82 557.26,281.2 555.28,294.01 " fill="none" id="C_0000000087-&gt;C_0000000067" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="554.51,298.97,559.8266,290.6794,555.2671,294.0276,551.9188,289.4681,554.51,298.97" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="563" y="265.0669">+i</text><!--MD5=[1657b8ceb47214a9e724aa86c3a0a3af]
-reverse link C_0000000087 to C_0000000069--><path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0000000087&lt;-C_0000000069" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="604.01,222.02,601.0746,228.6066,606.0255,233.8495,608.9609,227.2629,604.01,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="613" y="265.0669">+j</text><!--MD5=[129b7727932f6a04e661e2a8e44132c3]
-link C_0000000087 to C_0000000071--><path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0000000087-&gt;C_0000000071" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="680.96,298.82,680.3746,288.9886,678.6613,294.3797,673.2702,292.6664,680.96,298.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="666" y="265.0669">+k</text><!--MD5=[27ae11205e98afedf03c55ed4eb2cf59]
-reverse link C_0000000087 to C_0000000073--><path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0000000087&lt;-C_0000000073" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="679.15,222.02,680.1055,229.1675,687.0707,231.0346,686.1152,223.8871,679.15,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="725" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="732" y="265.0669">lm</text><!--MD5=[92d032b13643fc52095c5171924c642d]
-reverse link C_0000000087 to C_0000000075--><path d="M709.79,214.04 C725.71,226.77 741.76,239.67 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0000000087&lt;-C_0000000075" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.35,205.71,701.5411,212.5801,708.7256,213.1999,706.5344,206.3298,699.35,205.71" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="782" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="789" y="265.0669">lm</text><!--MD5=[32ef8a5e162e360bae49a0533648c881]
-reverse link C_0000000087 to C_0000000077--><path d="M710.52,188.74 C744.3,208.89 780.73,231.01 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0000000087&lt;-C_0000000077" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.17,181.99,702.2766,188.4976,709.4785,188.1329,706.3719,181.6253,699.17,181.99" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="847" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="854" y="265.0669">ns</text><!--MD5=[bfa11b33921c28a6f1ffa6ebb04318ad]
-reverse link C_0000000087 to C_0000000079--><path d="M711.06,171.42 C763.17,195.24 824,224 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0000000087&lt;-C_0000000079" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.05,165.94,702.847,172.0705,709.9663,170.9235,706.1693,164.793,699.05,165.94" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="915" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="922" y="265.0669">ns</text><!--MD5=[725977beb6181d5cce281ccfdd70e29b]
-reverse link C_0000000087 to C_0000000081--><path d="M711.69,160.29 C781.35,185.63 869.16,218.89 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0000000087&lt;-C_0000000081" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.35,155.81,703.6272,161.6156,710.6314,159.9003,706.3541,154.0947,699.35,155.81" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="989" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="996" y="265.0669">ns</text><!--MD5=[33f8a19fce1f82c54f4e349dc3052a98]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="flkgxxpj8sp5p" 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></defs><g><!--MD5=[66e740d0519b81a2275b4750257d4223]
+class C_0000000061--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000061" 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"/><!--MD5=[14b0f87ef469862b7dc851f400a41e7e]
+class C_0000000063--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000063" 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"/><!--MD5=[279d9d1e3088b487a0608dbc542bed8b]
+class C_0000000065--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000065" 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"/><!--MD5=[bd47d4af8f4577ac393e0572782dd7d1]
+class C_0000000067--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000067" 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"/><!--MD5=[531da34c930bd145c0fb4d43bbb1d8da]
+class C_0000000069--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000069" 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"/><!--MD5=[4276014d8ec8b7d2346c77463b869a1c]
+class C_0000000071--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000071" 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"/><!--MD5=[050374a9022b4d5f3b555580b54369e9]
+class C_0000000073--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000073" 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"/><!--MD5=[f413d1978815ccf9618e7c3db37c889a]
+class C_0000000075--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000075" 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"/><!--MD5=[555b25aa12d53462f58eba69dea5affc]
+class C_0000000077--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000077" 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"/><!--MD5=[2797d73fa10330f33f6a9ebb1f3e62b0]
+class C_0000000079--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000079" 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"/><!--MD5=[a41028ea3d32da8f1e732d0ceef5684e]
+class C_0000000081--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000081" 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"/><!--MD5=[1da358a7dd77cd262f0d80fd4b9b2874]
+class C_0000000083--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000083" 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"/><!--MD5=[e5823179ac53cbb27f513e77bb8381f4]
+class C_0000000085--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000085" 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"/><!--MD5=[ef6c0e414c886dba2242a646688caca0]
+class C_0000000087--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000087" 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"/><!--MD5=[3e401341331914e40988d5f38987d024]
+class C_0000000089--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000089" 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"/><!--MD5=[c5f8ec92ef7308012806ce589e923877]
+class C_0000000091--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000091" 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"/><!--MD5=[df675d0b0950445de9d1c8ad98da4137]
+class C_0000000093--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="60.8047" id="C_0000000093" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1370.5" y="405"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1371.5" y="417.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/><ellipse cx="1232.5" cy="451" 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="123" x="1241.5" y="454.2104">data : std::vector&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="460.8047" y2="460.8047"/><!--MD5=[ea0195e6310e09234d9f979f23d557b2]
+class C_0000000102--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="48" id="C_0000000102" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="1304" y="296"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="1305" y="308.1387">E</text><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"/><!--MD5=[a92d2c9a606e03767d36cab82c969055]
+class C_0000000097--><rect fill="#FEFECE" filter="url(#flkgxxpj8sp5p)" height="214.4609" id="C_0000000097" style="stroke: #A80036; stroke-width: 1.5;" width="226" x="473" 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="474" x2="698" y1="40" y2="40"/><ellipse cx="484" cy="51" 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="105" x="493" y="54.2104">a : std::vector&lt;A&gt;</text><ellipse cx="484" cy="63.8047" 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="112" x="493" y="67.0151">b : std::vector&lt;B*&gt;</text><ellipse cx="484" cy="76.6094" 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="113" x="493" y="79.8198">c : std::map&lt;int,C&gt;</text><ellipse cx="484" cy="89.4141" 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="120" x="493" y="92.6245">d : std::map&lt;int,D*&gt;</text><ellipse cx="484" cy="102.2188" 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="145" x="493" y="105.4292">e : custom_container&lt;E&gt;</text><ellipse cx="484" cy="115.0234" 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="180" x="493" y="118.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text><ellipse cx="484" cy="127.8281" 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="200" x="493" y="131.0386">g : std::map&lt;int,std::vector&lt;G*&gt;&gt;</text><ellipse cx="484" cy="140.6328" 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="119" x="493" y="143.8433">h : std::array&lt;H,10&gt;</text><ellipse cx="484" cy="153.4375" 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="109" x="493" y="156.6479">i : std::array&lt;I*,5&gt;</text><ellipse cx="484" cy="166.2422" 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="40" x="493" y="169.4526">j : J[10]</text><ellipse cx="484" cy="179.0469" 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="53" x="493" y="182.2573">k : K*[20]</text><ellipse cx="484" cy="191.8516" 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="190" x="493" y="195.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text><ellipse cx="484" cy="204.6563" 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="154" x="493" y="207.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="474" x2="698" y1="214.4609" y2="214.4609"/><!--MD5=[1c850b7e1e81ef4d55e816ff36fa86da]
+link C_0000000102 to C_0000000069--><path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000000102-&gt;C_0000000069" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1179.7,414.29,1187.7242,408.5793,1182.2451,409.9862,1180.8381,404.5071,1179.7,414.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6aed4941c6244d3577fd411b4b6d61dd]
+link C_0000000102 to C_0000000093--><path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000000102-&gt;C_0000000093" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1277.73,387,1281.73,407.81,1265.63,394.03,1277.73,387" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5cc4ff1b148956fd8fa7821b0886ce2c]
+reverse link C_0000000097 to C_0000000061--><path d="M460.02,154.89 C378.23,180.82 269.63,216.55 175,252 C124.45,270.94 110.96,274.23 63,299 C57.36,301.92 51.43,305.39 46.02,308.75 " fill="none" id="C_0000000097&lt;-C_0000000061" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.66,150.89,465.7321,148.8889,461.2204,154.5143,468.1483,156.5153,472.66,150.89" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="176" y="265.0669">+a</text><!--MD5=[2248df2d2db0b0f572985c82ca6d5c15]
+link C_0000000097 to C_0000000063--><path d="M472.71,160.05 C406.16,186.21 320.54,220.36 245,252 C197.09,272.07 183.95,274.78 138,299 C133.87,301.18 129.59,303.64 125.46,306.12 " fill="none" id="C_0000000097-&gt;C_0000000063" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="121.05,308.82,130.8145,307.5335,125.3146,306.2099,126.6383,300.71,121.05,308.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="246" y="265.0669">+b</text><!--MD5=[d66dac7872b480a724afbcafb0f92c4f]
+reverse link C_0000000097 to C_0000000065--><path d="M460.81,174.23 C387.99,208.94 294.89,254.73 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0000000097&lt;-C_0000000065" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.78,168.54,465.6431,167.5085,461.9459,173.6997,469.0829,174.7312,472.78,168.54" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="296" y="265.0669">+c</text><!--MD5=[25e684de5196457cdcfc55ca5fbc3b35]
+link C_0000000097 to C_0000000067--><path d="M472.92,185.74 C402.62,229.1 318.04,281.27 276.91,306.64 " fill="none" id="C_0000000097-&gt;C_0000000067" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="272.59,309.3,282.3493,307.9752,276.8444,306.6731,278.1464,301.1682,272.59,309.3" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="362" y="265.0669">+d</text><!--MD5=[7fc03ebc88e49776b69af7e40551c5e8]
+reverse link C_0000000097 to C_0000000102--><path d="M712.01,154.98 C798.71,181.93 916.45,218.76 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0000000097&lt;-C_0000000102" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.45,151.08,703.993,156.6801,710.9096,154.6405,706.3666,149.0404,699.45,151.08" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="1068" y="265.0669">+e</text><!--MD5=[ac694f1e3c2cda846fe93bafecb4dff9]
+reverse link C_0000000097 to C_0000000071--><path d="M462.35,214.35 C417.62,249.92 371.97,286.24 346.77,306.27 " fill="none" id="C_0000000097&lt;-C_0000000071" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="472.78,206.05,465.5941,206.6525,463.3865,213.5173,470.5723,212.9149,472.78,206.05" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="412" y="265.0669">+f</text><!--MD5=[0b1459a1a0c7552b5f20d2f1560822f5]
+link C_0000000097 to C_0000000073--><path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0000000097-&gt;C_0000000073" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="422.7,298.82,431.6776,294.7699,426.0298,295.0901,425.7097,289.4423,422.7,298.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="463" y="265.0669">+g</text><!--MD5=[a60c14928765bff8ee547d86cd4d70df]
+reverse link C_0000000097 to C_0000000075--><path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0000000097&lt;-C_0000000075" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="530.42,222.02,524.0933,225.4801,524.8539,232.651,531.1806,229.1909,530.42,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="514" y="265.0669">+h</text><!--MD5=[1cd108ccffa42d664ecb402ddaf25793]
+link C_0000000097 to C_0000000077--><path d="M567.07,222.13 C565.33,232.23 563.62,242.3 562,252 C559.7,265.82 557.26,281.2 555.28,294.01 " fill="none" id="C_0000000097-&gt;C_0000000077" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="554.51,298.97,559.8266,290.6794,555.2671,294.0276,551.9188,289.4681,554.51,298.97" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="563" y="265.0669">+i</text><!--MD5=[ae247c6b2b5cee37d69aae8dc5b4a13d]
+reverse link C_0000000097 to C_0000000079--><path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0000000097&lt;-C_0000000079" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="604.01,222.02,601.0746,228.6066,606.0255,233.8495,608.9609,227.2629,604.01,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="613" y="265.0669">+j</text><!--MD5=[af70c087d04d2a7fba88d249be293a3e]
+link C_0000000097 to C_0000000081--><path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0000000097-&gt;C_0000000081" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="680.96,298.82,680.3746,288.9886,678.6613,294.3797,673.2702,292.6664,680.96,298.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="666" y="265.0669">+k</text><!--MD5=[b16d92908bb952906fc90411485d3389]
+reverse link C_0000000097 to C_0000000083--><path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0000000097&lt;-C_0000000083" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="679.15,222.02,680.1055,229.1675,687.0707,231.0346,686.1152,223.8871,679.15,222.02" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="725" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="732" y="265.0669">lm</text><!--MD5=[50da55a8a8f68e32cde74147d36f21df]
+reverse link C_0000000097 to C_0000000085--><path d="M709.79,214.04 C725.71,226.77 741.76,239.67 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0000000097&lt;-C_0000000085" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.35,205.71,701.5411,212.5801,708.7256,213.1999,706.5344,206.3298,699.35,205.71" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="782" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="789" y="265.0669">lm</text><!--MD5=[2a5fc5c1fd71af01f11afbb807554102]
+reverse link C_0000000097 to C_0000000087--><path d="M710.52,188.74 C744.3,208.89 780.73,231.01 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0000000097&lt;-C_0000000087" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.17,181.99,702.2766,188.4976,709.4785,188.1329,706.3719,181.6253,699.17,181.99" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="847" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="854" y="265.0669">ns</text><!--MD5=[b7df2310846cc00691c282212cafb74c]
+reverse link C_0000000097 to C_0000000089--><path d="M711.06,171.42 C763.17,195.24 824,224 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0000000097&lt;-C_0000000089" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.05,165.94,702.847,172.0705,709.9663,170.9235,706.1693,164.793,699.05,165.94" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="915" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="922" y="265.0669">ns</text><!--MD5=[5edf222f334f6b61eabc4e1c9680d8bd]
+reverse link C_0000000097 to C_0000000091--><path d="M711.69,160.29 C781.35,185.63 869.16,218.89 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0000000097&lt;-C_0000000091" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="699.35,155.81,703.6272,161.6156,710.6314,159.9003,706.3541,154.0947,699.35,155.81" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="989" cy="261.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="996" y="265.0669">ns</text><!--MD5=[4fa19f738a72ed4ffe36b5df17f72063]
 @startuml
-class "A" as C_0000000051
-class C_0000000051 {
-}
 
-class "B" as C_0000000053
-class C_0000000053 {
-}
-
-class "C" as C_0000000055
-class C_0000000055 {
-}
-
-class "D" as C_0000000057
-class C_0000000057 {
-}
-
-class "E" as C_0000000059
-class C_0000000059 {
-}
-
-class "F" as C_0000000061
+class "A" as C_0000000061
 class C_0000000061 {
 }
 
-class "G" as C_0000000063
+class "B" as C_0000000063
 class C_0000000063 {
 }
 
-class "H" as C_0000000065
+class "C" as C_0000000065
 class C_0000000065 {
 }
 
-class "I" as C_0000000067
+class "D" as C_0000000067
 class C_0000000067 {
 }
 
-class "J" as C_0000000069
+class "E" as C_0000000069
 class C_0000000069 {
 }
 
-class "K" as C_0000000071
+class "F" as C_0000000071
 class C_0000000071 {
 }
 
-class "L" as C_0000000073
+class "G" as C_0000000073
 class C_0000000073 {
 }
 
-class "M" as C_0000000075
+class "H" as C_0000000075
 class C_0000000075 {
 }
 
-class "N" as C_0000000077
+class "I" as C_0000000077
 class C_0000000077 {
 }
 
-class "NN" as C_0000000079
+class "J" as C_0000000079
 class C_0000000079 {
 }
 
-class "NNN" as C_0000000081
+class "K" as C_0000000081
 class C_0000000081 {
 }
 
-class "custom_container<T>" as C_0000000083
+class "L" as C_0000000083
 class C_0000000083 {
+}
+
+class "M" as C_0000000085
+class C_0000000085 {
+}
+
+class "N" as C_0000000087
+class C_0000000087 {
+}
+
+class "NN" as C_0000000089
+class C_0000000089 {
+}
+
+class "NNN" as C_0000000091
+class C_0000000091 {
+}
+
+class "custom_container<T>" as C_0000000093
+class C_0000000093 {
 +data : std::vector<T>
 }
 
-class "custom_container<E>" as C_0000000092
-class C_0000000092 {
+class "custom_container<E>" as C_0000000102
+class C_0000000102 {
 }
 
-class "R" as C_0000000087
-class C_0000000087 {
+class "R" as C_0000000097
+class C_0000000097 {
 +a : std::vector<A>
 +b : std::vector<B*>
 +c : std::map<int,C>
@@ -127,24 +128,24 @@ class C_0000000087 {
 +ns : std::tuple<N,NN,NNN>
 }
 
-C_0000000092 ..> C_0000000059
-C_0000000092 ..|> C_0000000083
-C_0000000087 o- - C_0000000051 : +a
-C_0000000087 - -> C_0000000053 : +b
-C_0000000087 o- - C_0000000055 : +c
-C_0000000087 - -> C_0000000057 : +d
-C_0000000087 o- - C_0000000092 : +e
-C_0000000087 o- - C_0000000061 : +f
-C_0000000087 - -> C_0000000063 : +g
-C_0000000087 o- - C_0000000065 : +h
-C_0000000087 - -> C_0000000067 : +i
-C_0000000087 o- - C_0000000069 : +j
-C_0000000087 - -> C_0000000071 : +k
-C_0000000087 o- - C_0000000073 : +lm
-C_0000000087 o- - C_0000000075 : +lm
-C_0000000087 o- - C_0000000077 : +ns
-C_0000000087 o- - C_0000000079 : +ns
-C_0000000087 o- - C_0000000081 : +ns
+C_0000000102 ..> C_0000000069
+C_0000000102 ..|> C_0000000093
+C_0000000097 o- - C_0000000061 : +a
+C_0000000097 - -> C_0000000063 : +b
+C_0000000097 o- - C_0000000065 : +c
+C_0000000097 - -> C_0000000067 : +d
+C_0000000097 o- - C_0000000102 : +e
+C_0000000097 o- - C_0000000071 : +f
+C_0000000097 - -> C_0000000073 : +g
+C_0000000097 o- - C_0000000075 : +h
+C_0000000097 - -> C_0000000077 : +i
+C_0000000097 o- - C_0000000079 : +j
+C_0000000097 - -> C_0000000081 : +k
+C_0000000097 o- - C_0000000083 : +lm
+C_0000000097 o- - C_0000000085 : +lm
+C_0000000097 o- - C_0000000087 : +ns
+C_0000000097 o- - C_0000000089 : +ns
+C_0000000097 o- - C_0000000091 : +ns
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index 9c25164c..616fa5f8 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,34 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1k466voqjsim3" 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></defs><g><!--MD5=[61bcad93adc6da67f990944f9dcd7dae]
-class C_0000000117--><rect fill="#FEFECE" filter="url(#f1k466voqjsim3)" height="48" id="C_0000000117" 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"/><!--MD5=[674c9dbc5c49023d5afeee8cb6813e79]
-class C_0000000119--><rect fill="#FEFECE" filter="url(#f1k466voqjsim3)" height="48" id="C_0000000119" 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"/><!--MD5=[5f17d247cc3b08336a560a24e7e3fafc]
-class C_0000000121--><rect fill="#FEFECE" filter="url(#f1k466voqjsim3)" height="48" id="C_0000000121" 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"/><!--MD5=[70646846db80226abd1c31874daafe46]
-class C_0000000123--><rect fill="#FEFECE" filter="url(#f1k466voqjsim3)" height="86.4141" id="C_0000000123" 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"/><ellipse cx="32.5" cy="51" 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="130" x="41.5" y="54.2104">a : std::unique_ptr&lt;A&gt;</text><ellipse cx="32.5" cy="63.8047" 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="133" x="41.5" y="67.0151">b : std::shared_ptr&lt;B&gt;</text><ellipse cx="32.5" cy="76.6094" 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="121" x="41.5" y="79.8198">c : std::weak_ptr&lt;C&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="86.4141" y2="86.4141"/><!--MD5=[471f25e2115305db95719d8ac06d6ea1]
-reverse link C_0000000123 to C_0000000117--><path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000000123&lt;-C_0000000117" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="78.7,94.22,72.3597,97.6552,73.092,104.829,79.4323,101.3938,78.7,94.22" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="62" y="137.0669">+a</text><!--MD5=[4a3887be348f1a1574144bab800bd796]
-link C_0000000123 to C_0000000119--><path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000000123-&gt;C_0000000119" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="101,170.69,105,161.69,101,165.69,97,161.69,101,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="102" y="137.0669">+b</text><!--MD5=[55082a9f561a32eb0b17ca410b7bd443]
-link C_0000000123 to C_0000000121--><path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000000123-&gt;C_0000000121" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="163.69,170.69,163.0039,160.8651,161.346,166.2735,155.9375,164.6155,163.69,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="148" y="137.0669">+c</text><!--MD5=[e33f6b954eb8d41c187499c66447d6d7]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="fgl8mqlef6qj" 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></defs><g><!--MD5=[a3b5e63fab256103bc2b075fe8bf2b38]
+class C_0000000129--><rect fill="#FEFECE" filter="url(#fgl8mqlef6qj)" height="48" id="C_0000000129" 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"/><!--MD5=[2ca312ef9848e029803de3c2826ecc91]
+class C_0000000131--><rect fill="#FEFECE" filter="url(#fgl8mqlef6qj)" height="48" id="C_0000000131" 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"/><!--MD5=[1af11e3d819188b848f8ca998f013dbd]
+class C_0000000133--><rect fill="#FEFECE" filter="url(#fgl8mqlef6qj)" height="48" id="C_0000000133" 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"/><!--MD5=[0672063f91006512af55f888be888298]
+class C_0000000135--><rect fill="#FEFECE" filter="url(#fgl8mqlef6qj)" height="86.4141" id="C_0000000135" 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"/><ellipse cx="32.5" cy="51" 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="130" x="41.5" y="54.2104">a : std::unique_ptr&lt;A&gt;</text><ellipse cx="32.5" cy="63.8047" 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="133" x="41.5" y="67.0151">b : std::shared_ptr&lt;B&gt;</text><ellipse cx="32.5" cy="76.6094" 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="121" x="41.5" y="79.8198">c : std::weak_ptr&lt;C&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="86.4141" y2="86.4141"/><!--MD5=[8f5c75c2e9e620af9d3f0a53bfcf1552]
+reverse link C_0000000135 to C_0000000129--><path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000000135&lt;-C_0000000129" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="78.7,94.22,72.3597,97.6552,73.092,104.829,79.4323,101.3938,78.7,94.22" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="62" y="137.0669">+a</text><!--MD5=[473534d10b02a2923a425d4cc7c54e39]
+link C_0000000135 to C_0000000131--><path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000000135-&gt;C_0000000131" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="101,170.69,105,161.69,101,165.69,97,161.69,101,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="102" y="137.0669">+b</text><!--MD5=[dc40d025e3b53ea8b91249f1b8fe0a55]
+link C_0000000135 to C_0000000133--><path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000000135-&gt;C_0000000133" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="163.69,170.69,163.0039,160.8651,161.346,166.2735,155.9375,164.6155,163.69,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="148" y="137.0669">+c</text><!--MD5=[e5bc0f282395da487da8383de61669b8]
 @startuml
-class "A" as C_0000000117
-class C_0000000117 {
+
+class "A" as C_0000000129
+class C_0000000129 {
 }
 
-class "B" as C_0000000119
-class C_0000000119 {
+class "B" as C_0000000131
+class C_0000000131 {
 }
 
-class "C" as C_0000000121
-class C_0000000121 {
+class "C" as C_0000000133
+class C_0000000133 {
 }
 
-class "R" as C_0000000123
-class C_0000000123 {
+class "R" as C_0000000135
+class C_0000000135 {
 +a : std::unique_ptr<A>
 +b : std::shared_ptr<B>
 +c : std::weak_ptr<C>
 }
 
-C_0000000123 o- - C_0000000117 : +a
-C_0000000123 - -> C_0000000119 : +b
-C_0000000123 - -> C_0000000121 : +c
+C_0000000135 o- - C_0000000129 : +a
+C_0000000135 - -> C_0000000131 : +b
+C_0000000135 - -> C_0000000133 : +c
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index c0ac8f70..ab9cfcdc 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:570px;height:390px;" version="1.1" viewBox="0 0 570 390" width="570px" zoomAndPan="magnify"><defs><filter height="300%" id="fo8bq1xymci56" 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></defs><g><!--MD5=[2ca312ef9848e029803de3c2826ecc91]
-class C_0000000131--><rect fill="#FEFECE" filter="url(#fo8bq1xymci56)" height="124.8281" id="C_0000000131" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/><ellipse cx="37.65" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M40.6188,29.6406 Q40.0406,29.9375 39.4,30.0781 Q38.7594,30.2344 38.0563,30.2344 Q35.5563,30.2344 34.2281,28.5938 Q32.9156,26.9375 32.9156,23.8125 Q32.9156,20.6875 34.2281,19.0313 Q35.5563,17.375 38.0563,17.375 Q38.7594,17.375 39.4,17.5313 Q40.0563,17.6875 40.6188,17.9844 L40.6188,20.7031 Q39.9938,20.125 39.4,19.8594 Q38.8063,19.5781 38.1813,19.5781 Q36.8375,19.5781 36.15,20.6563 Q35.4625,21.7188 35.4625,23.8125 Q35.4625,25.9063 36.15,26.9844 Q36.8375,28.0469 38.1813,28.0469 Q38.8063,28.0469 39.4,27.7813 Q39.9938,27.5 40.6188,26.9219 L40.6188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="55.35" y="28.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="88" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="89" y="17.1387">T,P,CMP,int N</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="40" y2="40"/><ellipse cx="17" cy="51" 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="49" x="26" y="54.2104">value : T</text><ellipse cx="17" cy="63.8047" 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="65" x="26" y="67.0151">pointer : T*</text><ellipse cx="17" cy="76.6094" 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="84" x="26" y="79.8198">reference : T&amp;</text><ellipse cx="17" cy="89.4141" 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="135" x="26" y="92.6245">values : std::vector&lt;P&gt;</text><ellipse cx="17" cy="102.2188" 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="133" x="26" y="105.4292">ints : std::array&lt;int,N&gt;</text><ellipse cx="17" cy="115.0234" 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="102" x="26" y="118.2339">comparator : CMP</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="124.8281" y2="124.8281"/><!--MD5=[1dbbf3e582f8d487bcff7565ec2dd2b8]
-class C_0000000137--><rect fill="#FEFECE" filter="url(#fo8bq1xymci56)" height="60.8047" id="C_0000000137" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/><ellipse cx="252.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.2188,61.6406 Q254.6406,61.9375 254,62.0781 Q253.3594,62.2344 252.6563,62.2344 Q250.1563,62.2344 248.8281,60.5938 Q247.5156,58.9375 247.5156,55.8125 Q247.5156,52.6875 248.8281,51.0313 Q250.1563,49.375 252.6563,49.375 Q253.3594,49.375 254,49.5313 Q254.6563,49.6875 255.2188,49.9844 L255.2188,52.7031 Q254.5938,52.125 254,51.8594 Q253.4063,51.5781 252.7813,51.5781 Q251.4375,51.5781 250.75,52.6563 Q250.0625,53.7188 250.0625,55.8125 Q250.0625,57.9063 250.75,58.9844 Q251.4375,60.0469 252.7813,60.0469 Q253.4063,60.0469 254,59.7813 Q254.5938,59.5 255.2188,58.9219 L255.2188,61.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="272.75" y="60.1543">Vector</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="357" y="37"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="358" y="49.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="72" y2="72"/><ellipse cx="213" cy="83" 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="135" x="222" y="86.2104">values : std::vector&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="92.8047" y2="92.8047"/><!--MD5=[071b15036a69ef490329618fd161cba5]
-class C_0000000141--><rect fill="#FEFECE" filter="url(#fo8bq1xymci56)" height="60.8047" id="C_0000000141" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="379" y="319"/><ellipse cx="437.75" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M440.7188,340.6406 Q440.1406,340.9375 439.5,341.0781 Q438.8594,341.2344 438.1563,341.2344 Q435.6563,341.2344 434.3281,339.5938 Q433.0156,337.9375 433.0156,334.8125 Q433.0156,331.6875 434.3281,330.0313 Q435.6563,328.375 438.1563,328.375 Q438.8594,328.375 439.5,328.5313 Q440.1563,328.6875 440.7188,328.9844 L440.7188,331.7031 Q440.0938,331.125 439.5,330.8594 Q438.9063,330.5781 438.2813,330.5781 Q436.9375,330.5781 436.25,331.6563 Q435.5625,332.7188 435.5625,334.8125 Q435.5625,336.9063 436.25,337.9844 Q436.9375,339.0469 438.2813,339.0469 Q438.9063,339.0469 439.5,338.7813 Q440.0938,338.5 440.7188,337.9219 L440.7188,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="458.25" y="339.1543">B</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="518" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="519" y="328.1387">T,C&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="555" y1="351" y2="351"/><ellipse cx="390" cy="362" 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="151" x="399" y="365.2104">template_template : C&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="555" y1="371.8047" y2="371.8047"/><!--MD5=[0b56b27b9d4b9cd463fc14fead9dccee]
-class C_0000000144--><rect fill="#FEFECE" filter="url(#fo8bq1xymci56)" height="48" id="C_0000000144" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="415" y="210"/><ellipse cx="430" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M432.9688,231.6406 Q432.3906,231.9375 431.75,232.0781 Q431.1094,232.2344 430.4063,232.2344 Q427.9063,232.2344 426.5781,230.5938 Q425.2656,228.9375 425.2656,225.8125 Q425.2656,222.6875 426.5781,221.0313 Q427.9063,219.375 430.4063,219.375 Q431.1094,219.375 431.75,219.5313 Q432.4063,219.6875 432.9688,219.9844 L432.9688,222.7031 Q432.3438,222.125 431.75,221.8594 Q431.1563,221.5781 430.5313,221.5781 Q429.1875,221.5781 428.5,222.6563 Q427.8125,223.7188 427.8125,225.8125 Q427.8125,227.9063 428.5,228.9844 Q429.1875,230.0469 430.5313,230.0469 Q431.1563,230.0469 431.75,229.7813 Q432.3438,229.5 432.9688,228.9219 L432.9688,231.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="444" y="230.1543">B</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="460" y="207"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="461" y="219.1387">int,Vector</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="416" x2="519" y1="242" y2="242"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="416" x2="519" y1="250" y2="250"/><!--MD5=[1c04b6e137c1d1f6cf459cccb450a1ef]
-class C_0000000143--><rect fill="#FEFECE" filter="url(#fo8bq1xymci56)" height="73.6094" id="C_0000000143" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="398" y="33.5"/><ellipse cx="458.75" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M461.7188,55.1406 Q461.1406,55.4375 460.5,55.5781 Q459.8594,55.7344 459.1563,55.7344 Q456.6563,55.7344 455.3281,54.0938 Q454.0156,52.4375 454.0156,49.3125 Q454.0156,46.1875 455.3281,44.5313 Q456.6563,42.875 459.1563,42.875 Q459.8594,42.875 460.5,43.0313 Q461.1563,43.1875 461.7188,43.4844 L461.7188,46.2031 Q461.0938,45.625 460.5,45.3594 Q459.9063,45.0781 459.2813,45.0781 Q457.9375,45.0781 457.25,46.1563 Q456.5625,47.2188 456.5625,49.3125 Q456.5625,51.4063 457.25,52.4844 Q457.9375,53.5469 459.2813,53.5469 Q459.9063,53.5469 460.5,53.2813 Q461.0938,53 461.7188,52.4219 L461.7188,55.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="479.25" y="53.6543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="536" y1="65.5" y2="65.5"/><ellipse cx="409" cy="76.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="418" y="79.7104">ints : B&lt;int,Vector&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="536" y1="86.3047" y2="86.3047"/><ellipse cx="409" cy="97.3047" 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="85" x="418" y="100.5151">add(int i) : void</text><!--MD5=[ceae661e760e07c792eed7b63068a4e4]
-link C_0000000144 to C_0000000141--><path d="M467.5,258.24 C467.5,269.87 467.5,284.42 467.5,298.43 " fill="none" id="C_0000000144-&gt;C_0000000141" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="474.5,298.81,467.5,318.81,460.5,298.81,474.5,298.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[748277e14ff6417fe76918e3a1fedd3a]
-reverse link C_0000000143 to C_0000000144--><path d="M467.5,120.81 C467.5,150.42 467.5,186.71 467.5,209.85 " fill="none" id="C_0000000143&lt;-C_0000000144" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="467.5,107.74,463.5,113.74,467.5,119.74,471.5,113.74,467.5,107.74" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="473.5" cy="172.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="480.5" y="176.0669">ints</text><!--MD5=[c41bdcacab38c0338d14f8a0a2da1e48]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:570px;height:390px;" version="1.1" viewBox="0 0 570 390" width="570px" zoomAndPan="magnify"><defs><filter height="300%" id="fhb76u93t9wbd" 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></defs><g><!--MD5=[983b9b9bde2765b6c57967d2049a6aed]
+class C_0000000145--><rect fill="#FEFECE" filter="url(#fhb76u93t9wbd)" height="124.8281" id="C_0000000145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/><ellipse cx="37.65" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M40.6188,29.6406 Q40.0406,29.9375 39.4,30.0781 Q38.7594,30.2344 38.0563,30.2344 Q35.5563,30.2344 34.2281,28.5938 Q32.9156,26.9375 32.9156,23.8125 Q32.9156,20.6875 34.2281,19.0313 Q35.5563,17.375 38.0563,17.375 Q38.7594,17.375 39.4,17.5313 Q40.0563,17.6875 40.6188,17.9844 L40.6188,20.7031 Q39.9938,20.125 39.4,19.8594 Q38.8063,19.5781 38.1813,19.5781 Q36.8375,19.5781 36.15,20.6563 Q35.4625,21.7188 35.4625,23.8125 Q35.4625,25.9063 36.15,26.9844 Q36.8375,28.0469 38.1813,28.0469 Q38.8063,28.0469 39.4,27.7813 Q39.9938,27.5 40.6188,26.9219 L40.6188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="55.35" y="28.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="88" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="89" y="17.1387">T,P,CMP,int N</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="40" y2="40"/><ellipse cx="17" cy="51" 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="49" x="26" y="54.2104">value : T</text><ellipse cx="17" cy="63.8047" 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="65" x="26" y="67.0151">pointer : T*</text><ellipse cx="17" cy="76.6094" 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="84" x="26" y="79.8198">reference : T&amp;</text><ellipse cx="17" cy="89.4141" 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="135" x="26" y="92.6245">values : std::vector&lt;P&gt;</text><ellipse cx="17" cy="102.2188" 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="133" x="26" y="105.4292">ints : std::array&lt;int,N&gt;</text><ellipse cx="17" cy="115.0234" 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="102" x="26" y="118.2339">comparator : CMP</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="124.8281" y2="124.8281"/><!--MD5=[14f639b01b7323b64f78fc510d9cc343]
+class C_0000000151--><rect fill="#FEFECE" filter="url(#fhb76u93t9wbd)" height="60.8047" id="C_0000000151" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/><ellipse cx="252.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.2188,61.6406 Q254.6406,61.9375 254,62.0781 Q253.3594,62.2344 252.6563,62.2344 Q250.1563,62.2344 248.8281,60.5938 Q247.5156,58.9375 247.5156,55.8125 Q247.5156,52.6875 248.8281,51.0313 Q250.1563,49.375 252.6563,49.375 Q253.3594,49.375 254,49.5313 Q254.6563,49.6875 255.2188,49.9844 L255.2188,52.7031 Q254.5938,52.125 254,51.8594 Q253.4063,51.5781 252.7813,51.5781 Q251.4375,51.5781 250.75,52.6563 Q250.0625,53.7188 250.0625,55.8125 Q250.0625,57.9063 250.75,58.9844 Q251.4375,60.0469 252.7813,60.0469 Q253.4063,60.0469 254,59.7813 Q254.5938,59.5 255.2188,58.9219 L255.2188,61.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="272.75" y="60.1543">Vector</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="357" y="37"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="358" y="49.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="72" y2="72"/><ellipse cx="213" cy="83" 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="135" x="222" y="86.2104">values : std::vector&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="92.8047" y2="92.8047"/><!--MD5=[21050bf1dce42d90a3c65226e653dfd8]
+class C_0000000155--><rect fill="#FEFECE" filter="url(#fhb76u93t9wbd)" height="60.8047" id="C_0000000155" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="379" y="319"/><ellipse cx="437.75" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M440.7188,340.6406 Q440.1406,340.9375 439.5,341.0781 Q438.8594,341.2344 438.1563,341.2344 Q435.6563,341.2344 434.3281,339.5938 Q433.0156,337.9375 433.0156,334.8125 Q433.0156,331.6875 434.3281,330.0313 Q435.6563,328.375 438.1563,328.375 Q438.8594,328.375 439.5,328.5313 Q440.1563,328.6875 440.7188,328.9844 L440.7188,331.7031 Q440.0938,331.125 439.5,330.8594 Q438.9063,330.5781 438.2813,330.5781 Q436.9375,330.5781 436.25,331.6563 Q435.5625,332.7188 435.5625,334.8125 Q435.5625,336.9063 436.25,337.9844 Q436.9375,339.0469 438.2813,339.0469 Q438.9063,339.0469 439.5,338.7813 Q440.0938,338.5 440.7188,337.9219 L440.7188,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="458.25" y="339.1543">B</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="518" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="519" y="328.1387">T,C&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="555" y1="351" y2="351"/><ellipse cx="390" cy="362" 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="151" x="399" y="365.2104">template_template : C&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="555" y1="371.8047" y2="371.8047"/><!--MD5=[7a09e610df7079f8a493103d19842514]
+class C_0000000158--><rect fill="#FEFECE" filter="url(#fhb76u93t9wbd)" height="48" id="C_0000000158" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="415" y="210"/><ellipse cx="430" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M432.9688,231.6406 Q432.3906,231.9375 431.75,232.0781 Q431.1094,232.2344 430.4063,232.2344 Q427.9063,232.2344 426.5781,230.5938 Q425.2656,228.9375 425.2656,225.8125 Q425.2656,222.6875 426.5781,221.0313 Q427.9063,219.375 430.4063,219.375 Q431.1094,219.375 431.75,219.5313 Q432.4063,219.6875 432.9688,219.9844 L432.9688,222.7031 Q432.3438,222.125 431.75,221.8594 Q431.1563,221.5781 430.5313,221.5781 Q429.1875,221.5781 428.5,222.6563 Q427.8125,223.7188 427.8125,225.8125 Q427.8125,227.9063 428.5,228.9844 Q429.1875,230.0469 430.5313,230.0469 Q431.1563,230.0469 431.75,229.7813 Q432.3438,229.5 432.9688,228.9219 L432.9688,231.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="444" y="230.1543">B</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="460" y="207"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="461" y="219.1387">int,Vector</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="416" x2="519" y1="242" y2="242"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="416" x2="519" y1="250" y2="250"/><!--MD5=[f7810481eecf46afe49a130822de7c02]
+class C_0000000157--><rect fill="#FEFECE" filter="url(#fhb76u93t9wbd)" height="73.6094" id="C_0000000157" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="398" y="33.5"/><ellipse cx="458.75" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M461.7188,55.1406 Q461.1406,55.4375 460.5,55.5781 Q459.8594,55.7344 459.1563,55.7344 Q456.6563,55.7344 455.3281,54.0938 Q454.0156,52.4375 454.0156,49.3125 Q454.0156,46.1875 455.3281,44.5313 Q456.6563,42.875 459.1563,42.875 Q459.8594,42.875 460.5,43.0313 Q461.1563,43.1875 461.7188,43.4844 L461.7188,46.2031 Q461.0938,45.625 460.5,45.3594 Q459.9063,45.0781 459.2813,45.0781 Q457.9375,45.0781 457.25,46.1563 Q456.5625,47.2188 456.5625,49.3125 Q456.5625,51.4063 457.25,52.4844 Q457.9375,53.5469 459.2813,53.5469 Q459.9063,53.5469 460.5,53.2813 Q461.0938,53 461.7188,52.4219 L461.7188,55.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="479.25" y="53.6543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="536" y1="65.5" y2="65.5"/><ellipse cx="409" cy="76.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="418" y="79.7104">ints : B&lt;int,Vector&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="536" y1="86.3047" y2="86.3047"/><ellipse cx="409" cy="97.3047" 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="85" x="418" y="100.5151">add(int i) : void</text><!--MD5=[33bbc6b4a08a054e5ffb77ac9bf1067c]
+link C_0000000158 to C_0000000155--><path d="M467.5,258.24 C467.5,269.87 467.5,284.42 467.5,298.43 " fill="none" id="C_0000000158-&gt;C_0000000155" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="474.5,298.81,467.5,318.81,460.5,298.81,474.5,298.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[93b94e4e866d783c68236728694d64e1]
+reverse link C_0000000157 to C_0000000158--><path d="M467.5,120.81 C467.5,150.42 467.5,186.71 467.5,209.85 " fill="none" id="C_0000000157&lt;-C_0000000158" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="467.5,107.74,463.5,113.74,467.5,119.74,471.5,113.74,467.5,107.74" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="473.5" cy="172.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="480.5" y="176.0669">ints</text><!--MD5=[b4e74583aee2c36be2328364457e5e73]
 @startuml
-class "A<T,P,CMP,int N>" as C_0000000131
-class C_0000000131 {
+
+class "A<T,P,CMP,int N>" as C_0000000145
+class C_0000000145 {
 +value : T
 +pointer : T*
 +reference : T&
@@ -17,28 +18,28 @@ class C_0000000131 {
 +comparator : CMP
 }
 
-class "Vector<T>" as C_0000000137
-class C_0000000137 {
+class "Vector<T>" as C_0000000151
+class C_0000000151 {
 +values : std::vector<T>
 }
 
-class "B<T,C<>>" as C_0000000141
-class C_0000000141 {
+class "B<T,C<>>" as C_0000000155
+class C_0000000155 {
 +template_template : C<T>
 }
 
-class "B<int,Vector>" as C_0000000144
-class C_0000000144 {
+class "B<int,Vector>" as C_0000000158
+class C_0000000158 {
 }
 
-class "D" as C_0000000143
-class C_0000000143 {
+class "D" as C_0000000157
+class C_0000000157 {
 +add(int i) : void
 +ints : B<int,Vector>
 }
 
-C_0000000144 ..|> C_0000000141
-C_0000000143 o- - C_0000000144 : +ints
+C_0000000158 ..|> C_0000000155
+C_0000000157 o- - C_0000000158 : +ints
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index ef212070..ae6fd8b0 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,46 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1e0r8t37vexw4" 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></defs><g><!--MD5=[b844d5fb5caba4dfdeff8058f898cad8]
-class C_0000000147--><rect fill="#FEFECE" filter="url(#f1e0r8t37vexw4)" height="60.8047" id="C_0000000147" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="185.5" y="277"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="186.5" y="289.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/><ellipse cx="127.5" cy="323" 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="49" x="136.5" y="326.2104">value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="332.8047" y2="332.8047"/><!--MD5=[8f768f39242eaf79c785d512ac70f6a1]
-class C_0000000150--><rect fill="#FEFECE" filter="url(#f1e0r8t37vexw4)" height="48" id="C_0000000150" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="51" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="52" y="180.1387">int</text><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"/><!--MD5=[14f639b01b7323b64f78fc510d9cc343]
-class C_0000000151--><rect fill="#FEFECE" filter="url(#f1e0r8t37vexw4)" height="48" id="C_0000000151" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="146" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="147" y="180.1387">std::string</text><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"/><!--MD5=[dc2a4a27e7ee8bf811686727983bf6a0]
-class C_0000000152--><rect fill="#FEFECE" filter="url(#f1e0r8t37vexw4)" height="48" id="C_0000000152" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="150" x="287" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="288" y="180.1387">std::vector&lt;std::string&gt;</text><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"/><!--MD5=[e98a53cad892f4776c031a3eca5b38f6]
-class C_0000000149--><rect fill="#FEFECE" filter="url(#f1e0r8t37vexw4)" height="86.4141" id="C_0000000149" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="27.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="28.5" x2="279.5" y1="40" y2="40"/><ellipse cx="38.5" cy="51" 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="72" x="47.5" y="54.2104">aint : A&lt;int&gt;</text><ellipse cx="38.5" cy="63.8047" 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="142" x="47.5" y="67.0151">astring : A&lt;std::string&gt;*</text><ellipse cx="38.5" cy="76.6094" 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="227" x="47.5" y="79.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt;&amp;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="28.5" x2="279.5" y1="86.4141" y2="86.4141"/><!--MD5=[d4ff4b482f887b45c405240c76209b1a]
-link C_0000000150 to C_0000000147--><path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000000150-&gt;C_0000000147" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="113.57,260.9,123.13,279.81,103.86,270.99,113.57,260.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[275214ba247db6602994c3d402ff338f]
-link C_0000000151 to C_0000000147--><path d="M154,219.24 C154,230.87 154,245.42 154,259.43 " fill="none" id="C_0000000151-&gt;C_0000000147" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="161,259.81,154,279.81,147,259.81,161,259.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1a8bb9504a8c451ba989a897cd9546c7]
-link C_0000000152 to C_0000000147--><path d="M300.32,219.24 C274.03,235.46 238.51,257.37 209.05,275.54 " fill="none" id="C_0000000152-&gt;C_0000000147" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="212.33,281.75,191.63,286.29,204.98,269.83,212.33,281.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[decf5eecdb6f77331ae27fb68d8d2864]
-reverse link C_0000000149 to C_0000000150--><path d="M110.41,104.45 C91.49,127.23 70.29,152.74 55.37,170.69 " fill="none" id="C_0000000149&lt;-C_0000000150" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="118.92,94.22,112.0083,96.2764,111.2482,103.4473,118.1598,101.3909,118.92,94.22" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="105" y="137.0669">aint</text><!--MD5=[c8353ec376db849b2f05c8cb50de0dde]
-link C_0000000149 to C_0000000151--><path d="M154,94.22 C154,117.28 154,145.22 154,165.66 " fill="none" id="C_0000000149-&gt;C_0000000151" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="154,170.69,158,161.69,154,165.69,150,161.69,154,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="160" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="167" y="137.0669">astring</text><!--MD5=[190b28e0cf9609bc0921285d7c7c4a82]
-link C_0000000149 to C_0000000152--><path d="M208.71,94.22 C239.58,118.04 277.19,147.07 303.87,167.66 " fill="none" id="C_0000000149-&gt;C_0000000152" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="308.06,170.89,303.3833,162.2223,304.1033,167.8332,298.4924,168.5531,308.06,170.89" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="273" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="48" x="280" y="137.0669">avector</text><!--MD5=[cc12aae5de56ceb3f1689ddfaa840a74]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f131kcwiz7mt25" 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></defs><g><!--MD5=[edf111d72b8f1b94001cfa7f797d5f32]
+class C_0000000163--><rect fill="#FEFECE" filter="url(#f131kcwiz7mt25)" height="60.8047" id="C_0000000163" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="185.5" y="277"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="186.5" y="289.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/><ellipse cx="127.5" cy="323" 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="49" x="136.5" y="326.2104">value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="332.8047" y2="332.8047"/><!--MD5=[9d34e51a5bb385ced72068af83e4574d]
+class C_0000000166--><rect fill="#FEFECE" filter="url(#f131kcwiz7mt25)" height="48" id="C_0000000166" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="51" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="52" y="180.1387">int</text><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"/><!--MD5=[f8c3006e9c603ec963520b3eef854a15]
+class C_0000000167--><rect fill="#FEFECE" filter="url(#f131kcwiz7mt25)" height="48" id="C_0000000167" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="146" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="147" y="180.1387">std::string</text><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"/><!--MD5=[82b30be113a880ba1e5c73fd4dd9ad00]
+class C_0000000168--><rect fill="#FEFECE" filter="url(#f131kcwiz7mt25)" height="48" id="C_0000000168" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="150" x="287" y="168"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="288" y="180.1387">std::vector&lt;std::string&gt;</text><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"/><!--MD5=[18211cd4a86ed46bef8f66dc929db34b]
+class C_0000000165--><rect fill="#FEFECE" filter="url(#f131kcwiz7mt25)" height="86.4141" id="C_0000000165" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="27.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="28.5" x2="279.5" y1="40" y2="40"/><ellipse cx="38.5" cy="51" 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="72" x="47.5" y="54.2104">aint : A&lt;int&gt;</text><ellipse cx="38.5" cy="63.8047" 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="142" x="47.5" y="67.0151">astring : A&lt;std::string&gt;*</text><ellipse cx="38.5" cy="76.6094" 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="227" x="47.5" y="79.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt;&amp;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="28.5" x2="279.5" y1="86.4141" y2="86.4141"/><!--MD5=[3ea08f28388cff7544c382cfea7589cd]
+link C_0000000166 to C_0000000163--><path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000000166-&gt;C_0000000163" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="113.57,260.9,123.13,279.81,103.86,270.99,113.57,260.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8dc82255e9cfe3bf706b014596e753fe]
+link C_0000000167 to C_0000000163--><path d="M154,219.24 C154,230.87 154,245.42 154,259.43 " fill="none" id="C_0000000167-&gt;C_0000000163" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="161,259.81,154,279.81,147,259.81,161,259.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[67fe09068cb01a21ebc078347b81ac3c]
+link C_0000000168 to C_0000000163--><path d="M300.32,219.24 C274.03,235.46 238.51,257.37 209.05,275.54 " fill="none" id="C_0000000168-&gt;C_0000000163" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="212.33,281.75,191.63,286.29,204.98,269.83,212.33,281.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[94b5dfb0d453e77b3ac7bd4505544bfd]
+reverse link C_0000000165 to C_0000000166--><path d="M110.41,104.45 C91.49,127.23 70.29,152.74 55.37,170.69 " fill="none" id="C_0000000165&lt;-C_0000000166" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="118.92,94.22,112.0083,96.2764,111.2482,103.4473,118.1598,101.3909,118.92,94.22" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="105" y="137.0669">aint</text><!--MD5=[db3c070cc088adc4496e6a700c373057]
+link C_0000000165 to C_0000000167--><path d="M154,94.22 C154,117.28 154,145.22 154,165.66 " fill="none" id="C_0000000165-&gt;C_0000000167" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="154,170.69,158,161.69,154,165.69,150,161.69,154,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="160" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="167" y="137.0669">astring</text><!--MD5=[375c8fc7e49e453bbd30c03dd2fc7606]
+link C_0000000165 to C_0000000168--><path d="M208.71,94.22 C239.58,118.04 277.19,147.07 303.87,167.66 " fill="none" id="C_0000000165-&gt;C_0000000168" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="308.06,170.89,303.3833,162.2223,304.1033,167.8332,298.4924,168.5531,308.06,170.89" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="273" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="48" x="280" y="137.0669">avector</text><!--MD5=[195ebbd7d63eb75450b9a06352eb10cc]
 @startuml
-class "A<T>" as C_0000000147
-class C_0000000147 {
+
+class "A<T>" as C_0000000163
+class C_0000000163 {
 +value : T
 }
 
-class "A<int>" as C_0000000150
-class C_0000000150 {
+class "A<int>" as C_0000000166
+class C_0000000166 {
 }
 
-class "A<std::string>" as C_0000000151
-class C_0000000151 {
+class "A<std::string>" as C_0000000167
+class C_0000000167 {
 }
 
-class "A<std::vector<std::string>>" as C_0000000152
-class C_0000000152 {
+class "A<std::vector<std::string>>" as C_0000000168
+class C_0000000168 {
 }
 
-class "B" as C_0000000149
-class C_0000000149 {
+class "B" as C_0000000165
+class C_0000000165 {
 +aint : A<int>
 +astring : A<std::string>*
 +avector : A<std::vector<std::string>>&
 }
 
-C_0000000150 ..|> C_0000000147
-C_0000000151 ..|> C_0000000147
-C_0000000152 ..|> C_0000000147
-C_0000000149 o- - C_0000000150 : +aint
-C_0000000149 - -> C_0000000151 : +astring
-C_0000000149 - -> C_0000000152 : +avector
+C_0000000166 ..|> C_0000000163
+C_0000000167 ..|> C_0000000163
+C_0000000168 ..|> C_0000000163
+C_0000000165 o- - C_0000000166 : +aint
+C_0000000165 - -> C_0000000167 : +astring
+C_0000000165 - -> C_0000000168 : +avector
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 0747652c..03bd89fc 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,42 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1nealnc43zwu7" 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></defs><g><!--MD5=[787e726d6764059386e9c75c8fa2b8f7]
-class C_0000000159--><rect fill="#FEFECE" filter="url(#f1nealnc43zwu7)" height="73.6094" id="C_0000000159" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="118.5" y="499"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="119.5" y="511.1387">T,P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/><ellipse cx="60.5" cy="545" 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="42" x="69.5" y="548.2104">first : T</text><ellipse cx="60.5" cy="557.8047" 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="60" x="69.5" y="561.0151">second : P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="567.6094" y2="567.6094"/><!--MD5=[5e0fee9635c208fc0d19bd7eed50df9d]
-class C_0000000162--><rect fill="#FEFECE" filter="url(#f1nealnc43zwu7)" height="48" id="C_0000000162" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="79" y="390"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="80" y="402.1387">T,std::string</text><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"/><!--MD5=[e2375b76df7a57a58f7d5bc2b9752026]
-class C_0000000161--><rect fill="#FEFECE" filter="url(#f1nealnc43zwu7)" height="60.8047" id="C_0000000161" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="173" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174" y="264.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/><ellipse cx="17" cy="298" 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="147" x="26" y="301.2104">astring : A&lt;T,std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="307.8047" y2="307.8047"/><!--MD5=[9d34e51a5bb385ced72068af83e4574d]
-class C_0000000166--><rect fill="#FEFECE" filter="url(#f1nealnc43zwu7)" height="48" id="C_0000000166" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="107.5" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.5" y="155.1387">int</text><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"/><!--MD5=[18211cd4a86ed46bef8f66dc929db34b]
-class C_0000000165--><rect fill="#FEFECE" filter="url(#f1nealnc43zwu7)" height="60.8047" id="C_0000000165" 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"/><ellipse cx="37.5" cy="51" 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="106" x="46.5" y="54.2104">aintstring : B&lt;int&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="60.8047" y2="60.8047"/><!--MD5=[e95f2ed5103fad07271986bb1936a88f]
-link C_0000000162 to C_0000000159--><path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0000000162-&gt;C_0000000159" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="99.5,481.71,92.5,501.71,85.5,481.71,99.5,481.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1962390ff08f76ed4339067cabcdff28]
-reverse link C_0000000161 to C_0000000162--><path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0000000161&lt;-C_0000000162" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="92.5,316.21,88.5,322.21,92.5,328.21,96.5,322.21,92.5,316.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98.5" cy="355.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="105.5" y="359.0669">astring</text><!--MD5=[469834d4bb6cf972544209c6cad47f17]
-link C_0000000166 to C_0000000161--><path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0000000166-&gt;C_0000000161" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="99.5,234.81,92.5,254.81,85.5,234.81,99.5,234.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[94b5dfb0d453e77b3ac7bd4505544bfd]
-reverse link C_0000000165 to C_0000000166--><path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0000000165&lt;-C_0000000166" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="92.5,69.21,88.5,75.21,92.5,81.21,96.5,75.21,92.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="60" x="105.5" y="112.0669">aintstring</text><!--MD5=[302e3d2d2e93dbb2b24b678e36ce1708]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f8kxrhj5x7fdg" 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></defs><g><!--MD5=[14e95b8cff557b8f8f278a2c6746d1d5]
+class C_0000000177--><rect fill="#FEFECE" filter="url(#f8kxrhj5x7fdg)" height="73.6094" id="C_0000000177" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="118.5" y="499"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="119.5" y="511.1387">T,P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/><ellipse cx="60.5" cy="545" 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="42" x="69.5" y="548.2104">first : T</text><ellipse cx="60.5" cy="557.8047" 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="60" x="69.5" y="561.0151">second : P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="567.6094" y2="567.6094"/><!--MD5=[715484bee26d108a8b28ef652785318f]
+class C_0000000180--><rect fill="#FEFECE" filter="url(#f8kxrhj5x7fdg)" height="48" id="C_0000000180" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="79" y="390"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="80" y="402.1387">T,std::string</text><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"/><!--MD5=[27dd2802f7f1eef71e7137bdb4aa677f]
+class C_0000000179--><rect fill="#FEFECE" filter="url(#f8kxrhj5x7fdg)" height="60.8047" id="C_0000000179" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="173" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174" y="264.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/><ellipse cx="17" cy="298" 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="147" x="26" y="301.2104">astring : A&lt;T,std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="307.8047" y2="307.8047"/><!--MD5=[39eddff5f91ee783bf899f004169a20c]
+class C_0000000184--><rect fill="#FEFECE" filter="url(#f8kxrhj5x7fdg)" height="48" id="C_0000000184" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="107.5" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.5" y="155.1387">int</text><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"/><!--MD5=[346b98f629fbbb086d11db3997cf442c]
+class C_0000000183--><rect fill="#FEFECE" filter="url(#f8kxrhj5x7fdg)" height="60.8047" id="C_0000000183" 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"/><ellipse cx="37.5" cy="51" 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="106" x="46.5" y="54.2104">aintstring : B&lt;int&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="60.8047" y2="60.8047"/><!--MD5=[3d1a8dbbf4dd35bbf1db0dd9c6aa817a]
+link C_0000000180 to C_0000000177--><path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0000000180-&gt;C_0000000177" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="99.5,481.71,92.5,501.71,85.5,481.71,99.5,481.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[35896d1a5d7a015a4b37137a9bfb6a80]
+reverse link C_0000000179 to C_0000000180--><path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0000000179&lt;-C_0000000180" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="92.5,316.21,88.5,322.21,92.5,328.21,96.5,322.21,92.5,316.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98.5" cy="355.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="105.5" y="359.0669">astring</text><!--MD5=[948957a45a05dfa23f66617e51d76a41]
+link C_0000000184 to C_0000000179--><path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0000000184-&gt;C_0000000179" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="99.5,234.81,92.5,254.81,85.5,234.81,99.5,234.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[22ece222a37268de90520587b8da1b9b]
+reverse link C_0000000183 to C_0000000184--><path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0000000183&lt;-C_0000000184" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="92.5,69.21,88.5,75.21,92.5,81.21,96.5,75.21,92.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="98.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="60" x="105.5" y="112.0669">aintstring</text><!--MD5=[929493a7b30f074c488e93073d941a03]
 @startuml
-class "A<T,P>" as C_0000000159
-class C_0000000159 {
+
+class "A<T,P>" as C_0000000177
+class C_0000000177 {
 +first : T
 +second : P
 }
 
-class "A<T,std::string>" as C_0000000162
-class C_0000000162 {
+class "A<T,std::string>" as C_0000000180
+class C_0000000180 {
 }
 
-class "B<T>" as C_0000000161
-class C_0000000161 {
+class "B<T>" as C_0000000179
+class C_0000000179 {
 +astring : A<T,std::string>
 }
 
-class "B<int>" as C_0000000166
-class C_0000000166 {
+class "B<int>" as C_0000000184
+class C_0000000184 {
 }
 
-class "C" as C_0000000165
-class C_0000000165 {
+class "C" as C_0000000183
+class C_0000000183 {
 +aintstring : B<int>
 }
 
-C_0000000162 ..|> C_0000000159
-C_0000000161 o- - C_0000000162 : +astring
-C_0000000166 ..|> C_0000000161
-C_0000000165 o- - C_0000000166 : +aintstring
+C_0000000180 ..|> C_0000000177
+C_0000000179 o- - C_0000000180 : +astring
+C_0000000184 ..|> C_0000000179
+C_0000000183 o- - C_0000000184 : +aintstring
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 0fa293b2..67d574c1 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:220px;height:230px;" version="1.1" viewBox="0 0 220 230" width="220px" zoomAndPan="magnify"><defs><filter height="300%" id="favqz7wi19ieh" 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></defs><g><!--MD5=[c43c55eb4ce5a07bdb7131586393c681]
-class C_0000000170--><rect fill="#FEFECE" filter="url(#favqz7wi19ieh)" height="60.8047" id="C_0000000170" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="75" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="76" y="17.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="60.8047" y2="60.8047"/><!--MD5=[f1bdd80c2e61fb22958107bd8b7c169a]
-class C_0000000172--><rect fill="#FEFECE" filter="url(#favqz7wi19ieh)" height="60.8047" id="C_0000000172" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="48" y2="48"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="124" y="56"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="62.2104">foo() : void</text><!--MD5=[48e71c759d7255bfafe4b020d56d4046]
-class C_0000000174--><rect fill="#FEFECE" filter="url(#favqz7wi19ieh)" height="73.6094" id="C_0000000174" 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"/><ellipse cx="127" cy="189" 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="49" x="136" y="192.2104">m_a : A*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/><ellipse cx="127" cy="209.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="61" x="136" y="213.0151">foo() : void</text><!--MD5=[f1069460e2d0a095b86ad0d01c5e8c63]
-reverse link C_0000000172 to C_0000000174--><path d="M120.97,73.12 C111.05,85.82 104.42,100.87 109.5,116 C113.03,126.49 118.95,136.64 125.52,145.71 " fill="none" id="C_0000000172&lt;-C_0000000174" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="124.15,69.26,115.3524,73.6874,120.9815,73.1279,121.541,78.757,124.15,69.26" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="110.5" y="112.0669">«friend»</text><!--MD5=[fcf17dec15f651da544abd9b2378ca1f]
-link C_0000000174 to C_0000000172--><path d="M165.58,145.68 C167.33,131.17 168.52,114.31 167.5,99 C166.96,90.9 166.01,82.23 164.94,74.08 " fill="none" id="C_0000000174-&gt;C_0000000172" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="164.27,69.08,161.5142,78.5354,164.9411,74.0348,169.4418,77.4617,164.27,69.08" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="173.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="28" x="180.5" y="112.0669">m_a</text><!--MD5=[e5aceba29070b1dd733b529056965311]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:220px;height:230px;" version="1.1" viewBox="0 0 220 230" width="220px" zoomAndPan="magnify"><defs><filter height="300%" id="frbpcfov2h3cp" 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></defs><g><!--MD5=[2da02c7ddf751aa764a8a38568c86de1]
+class C_0000000189--><rect fill="#FEFECE" filter="url(#frbpcfov2h3cp)" height="60.8047" id="C_0000000189" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="75" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="76" y="17.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="60.8047" y2="60.8047"/><!--MD5=[1e0ac239c107d9a2589464ba4bc7c1be]
+class C_0000000191--><rect fill="#FEFECE" filter="url(#frbpcfov2h3cp)" height="60.8047" id="C_0000000191" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="48" y2="48"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="124" y="56"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="62.2104">foo() : void</text><!--MD5=[96c9d830ce65c5d1ac6e166f0aa0d0ae]
+class C_0000000193--><rect fill="#FEFECE" filter="url(#frbpcfov2h3cp)" height="73.6094" id="C_0000000193" 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"/><ellipse cx="127" cy="189" 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="49" x="136" y="192.2104">m_a : A*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/><ellipse cx="127" cy="209.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="61" x="136" y="213.0151">foo() : void</text><!--MD5=[279344e7214cf122344ad8393bae03e6]
+reverse link C_0000000191 to C_0000000193--><path d="M120.97,73.12 C111.05,85.82 104.42,100.87 109.5,116 C113.03,126.49 118.95,136.64 125.52,145.71 " fill="none" id="C_0000000191&lt;-C_0000000193" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="124.15,69.26,115.3524,73.6874,120.9815,73.1279,121.541,78.757,124.15,69.26" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="110.5" y="112.0669">«friend»</text><!--MD5=[c7881e6b2dc68418286aa8ebc9200da5]
+link C_0000000193 to C_0000000191--><path d="M165.58,145.68 C167.33,131.17 168.52,114.31 167.5,99 C166.96,90.9 166.01,82.23 164.94,74.08 " fill="none" id="C_0000000193-&gt;C_0000000191" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="164.27,69.08,161.5142,78.5354,164.9411,74.0348,169.4418,77.4617,164.27,69.08" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="173.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="28" x="180.5" y="112.0669">m_a</text><!--MD5=[cc528fabc836d0c75eab8bf75f8182a6]
 @startuml
 
-class "D<T>" as C_0000000170
-class C_0000000170 {
+class "D<T>" as C_0000000189
+class C_0000000189 {
 -value : T
 }
 
-class "A" as C_0000000172
-class C_0000000172 {
+class "A" as C_0000000191
+class C_0000000191 {
 -foo() : void
 }
 
-class "B" as C_0000000174
-class C_0000000174 {
+class "B" as C_0000000193
+class C_0000000193 {
 +foo() : void
 +m_a : A*
 }
 
-C_0000000172 <.. C_0000000174 : <<friend>>
-C_0000000174 - -> C_0000000172 : +m_a
+C_0000000191 <.. C_0000000193 : <<friend>>
+C_0000000193 - -> C_0000000191 : +m_a
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 2e3b7f45..77b37438 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,62 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1bkrocuwg7w1w" 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></defs><g><!--MD5=[2e375d1b00f6fc270fb14cf7f93f607e]
-class C_0000000176--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="73.6094" id="C_0000000176" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="869.5" y="306"/><ellipse cx="888.55" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M891.5188,327.6406 Q890.9406,327.9375 890.3,328.0781 Q889.6594,328.2344 888.9563,328.2344 Q886.4563,328.2344 885.1281,326.5938 Q883.8156,324.9375 883.8156,321.8125 Q883.8156,318.6875 885.1281,317.0313 Q886.4563,315.375 888.9563,315.375 Q889.6594,315.375 890.3,315.5313 Q890.9563,315.6875 891.5188,315.9844 L891.5188,318.7031 Q890.8938,318.125 890.3,317.8594 Q889.7063,317.5781 889.0813,317.5781 Q887.7375,317.5781 887.05,318.6563 Q886.3625,319.7188 886.3625,321.8125 Q886.3625,323.9063 887.05,324.9844 Q887.7375,326.0469 889.0813,326.0469 Q889.7063,326.0469 890.3,325.7813 Q890.8938,325.5 891.5188,324.9219 L891.5188,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="903.45" y="326.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="923.5" y="303"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="924.5" y="315.1387">T,Ts...</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="870.5" x2="957.5" y1="338" y2="338"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="877.5" y="346"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="889.5" y="352.2104">value : T</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="877.5" y="358.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="63" x="889.5" y="365.0151">values : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="870.5" x2="957.5" y1="371.6094" y2="371.6094"/><!--MD5=[63f1bef6249293989777fa340beb0392]
-class C_0000000178--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="60.8047" id="C_0000000178" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="1307" y="309.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="1308" y="321.6387">int Is...</text><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"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/><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><!--MD5=[860f17ac10dccc14d45ff64275cb595b]
-class C_0000000182--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="60.8047" id="C_0000000182" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="304.5" y="309.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="305.5" y="321.6387">T,int Is...</text><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"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/><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><!--MD5=[bdedef34be90f09d610084fff2afb8a6]
-class C_0000000187--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="48" id="C_0000000187" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="116" x="803" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="804" y="206.1387">int,std::string,float</text><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"/><!--MD5=[2b3cf5007c98efaa7a5f53ac3092ebfc]
-class C_0000000188--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="48" id="C_0000000188" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="115" x="996.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="113" x="997.5" y="206.1387">int,std::string,bool</text><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"/><!--MD5=[2da02c7ddf751aa764a8a38568c86de1]
-class C_0000000189--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="48" id="C_0000000189" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="1189" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1190" y="206.1387">3,2,1</text><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"/><!--MD5=[60cd408110fa28767f4342d8f5e46081]
-class C_0000000190--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="48" id="C_0000000190" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="46" x="1300" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="44" x="1301" y="206.1387">1,1,1,1</text><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"/><!--MD5=[1e0ac239c107d9a2589464ba4bc7c1be]
-class C_0000000191--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="48" id="C_0000000191" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="452" x="51" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="450" x="52" y="206.1387">std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3</text><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"/><!--MD5=[cf295b530a4fefc129655c34795ddb61]
-class C_0000000186--><rect fill="#FEFECE" filter="url(#f1bkrocuwg7w1w)" height="112.0234" id="C_0000000186" 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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="54.2104">a1 : A&lt;int,std::string,float&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="67.0151">a2 : A&lt;int,std::string,bool&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="79.8198">b1 : B&lt;3,2,1&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="92.6245">b2 : B&lt;1,1,1,1&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="99.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="105.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><line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="112.0234" y2="112.0234"/><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(#f1bkrocuwg7w1w)" 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><!--MD5=[c97c230f5e5f0ad7cb905cb2a3de7cc4]
-link C_0000000187 to C_0000000176--><path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000000187-&gt;C_0000000176" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="885.81,285.1,890.71,305.71,874.02,292.66,885.81,285.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2d57f336f3dc7800bd7f477d992ed24c]
-link C_0000000188 to C_0000000176--><path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0000000188-&gt;C_0000000176" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="968.01,296.2,949.08,305.71,957.95,286.47,968.01,296.2" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d477c57f6d5a3c236a2e8d964c15f3dc]
-link C_0000000189 to C_0000000178--><path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0000000189-&gt;C_0000000178" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1223.76,291.07,1226.3,312.11,1211.2,297.25,1223.76,291.07" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a00df458b845a8c4684ffeea48737c3e]
-link C_0000000190 to C_0000000178--><path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000000190-&gt;C_0000000178" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1270.45,297.14,1255.45,312.11,1257.85,291.05,1270.45,297.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[03df6a2b217830ae0a6590f759f1639c]
-link C_0000000191 to C_0000000182--><path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0000000191-&gt;C_0000000182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="260,292.11,253,312.11,246,292.11,260,292.11" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[87979a1d1e5725184357e983db89ccf0]
-reverse link C_0000000186 to C_0000000187--><path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0000000186&lt;-C_0000000187" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="961.41,120.08,954.2275,120.722,952.0576,127.5988,959.2401,126.9569,961.41,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="925" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="935" y="163.0669">a1</text><!--MD5=[cd1d65043f2a7b67b5c3f54d3ef74700]
-reverse link C_0000000186 to C_0000000188--><path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0000000186&lt;-C_0000000188" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1030,120.08,1026,126.08,1030,132.08,1034,126.08,1030,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1033" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1043" y="163.0669">a2</text><!--MD5=[74fe9594019116252e38020ab161f9fa]
-reverse link C_0000000186 to C_0000000189--><path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0000000186&lt;-C_0000000189" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1084.02,120.08,1085.3627,127.165,1092.4191,128.6506,1091.0764,121.5656,1084.02,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1132" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1142" y="163.0669">b1</text><!--MD5=[fe5241e60ee30cd1645b1027aeb12702]
-reverse link C_0000000186 to C_0000000190--><path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0000000186&lt;-C_0000000190" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1125.6,120.08,1128.8056,126.5394,1136.001,126.0649,1132.7955,119.6054,1125.6,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1207" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1217" y="163.0669">b2</text><!--MD5=[4931c29adace1303390d092745139d6c]
-reverse link C_0000000186 to C_0000000191--><path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0000000186&lt;-C_0000000191" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="783.35,114.2,776.6838,111.4501,771.5815,116.5458,778.2477,119.2957,783.35,114.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="598" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="608" y="163.0669">c1</text><!--MD5=[66c7f0374d74a5dc9c4010a9186a2d8d]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="fx7ex62vymrd5" 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></defs><g><!--MD5=[070ef3ff0b25dc3d6c655055626ba74f]
+class C_0000000197--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="73.6094" id="C_0000000197" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="869.5" y="306"/><ellipse cx="888.55" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M891.5188,327.6406 Q890.9406,327.9375 890.3,328.0781 Q889.6594,328.2344 888.9563,328.2344 Q886.4563,328.2344 885.1281,326.5938 Q883.8156,324.9375 883.8156,321.8125 Q883.8156,318.6875 885.1281,317.0313 Q886.4563,315.375 888.9563,315.375 Q889.6594,315.375 890.3,315.5313 Q890.9563,315.6875 891.5188,315.9844 L891.5188,318.7031 Q890.8938,318.125 890.3,317.8594 Q889.7063,317.5781 889.0813,317.5781 Q887.7375,317.5781 887.05,318.6563 Q886.3625,319.7188 886.3625,321.8125 Q886.3625,323.9063 887.05,324.9844 Q887.7375,326.0469 889.0813,326.0469 Q889.7063,326.0469 890.3,325.7813 Q890.8938,325.5 891.5188,324.9219 L891.5188,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="903.45" y="326.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="923.5" y="303"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="924.5" y="315.1387">T,Ts...</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="870.5" x2="957.5" y1="338" y2="338"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="877.5" y="346"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="889.5" y="352.2104">value : T</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="877.5" y="358.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="63" x="889.5" y="365.0151">values : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="870.5" x2="957.5" y1="371.6094" y2="371.6094"/><!--MD5=[0f78811caa15f263a90f21e925f0064b]
+class C_0000000199--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="60.8047" id="C_0000000199" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="1307" y="309.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="1308" y="321.6387">int Is...</text><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"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/><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><!--MD5=[c0aa481eed6a3d9a597286518f0efdf0]
+class C_0000000203--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="60.8047" id="C_0000000203" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="304.5" y="309.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="305.5" y="321.6387">T,int Is...</text><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"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/><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><!--MD5=[e368d496503bc4cd8fea75b57c17fc58]
+class C_0000000208--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="48" id="C_0000000208" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="116" x="803" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="804" y="206.1387">int,std::string,float</text><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"/><!--MD5=[121af0209425ebaf00ca487d61fcd64f]
+class C_0000000209--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="48" id="C_0000000209" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="115" x="996.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="113" x="997.5" y="206.1387">int,std::string,bool</text><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"/><!--MD5=[cc1deedd7792ae89e2cb87546df30c7e]
+class C_0000000210--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="48" id="C_0000000210" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="1189" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1190" y="206.1387">3,2,1</text><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"/><!--MD5=[a3b06b7dcce083153dbb5c3591024ee7]
+class C_0000000211--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="48" id="C_0000000211" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="46" x="1300" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="44" x="1301" y="206.1387">1,1,1,1</text><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"/><!--MD5=[5901f6919d37ff89fec4086843553d2d]
+class C_0000000212--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="48" id="C_0000000212" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="452" x="51" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="450" x="52" y="206.1387">std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3</text><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"/><!--MD5=[8a3b6b560738631970580ea5ca1d77dc]
+class C_0000000207--><rect fill="#FEFECE" filter="url(#fx7ex62vymrd5)" height="112.0234" id="C_0000000207" 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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="54.2104">a1 : A&lt;int,std::string,float&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="67.0151">a2 : A&lt;int,std::string,bool&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="79.8198">b1 : B&lt;3,2,1&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="92.6245">b2 : B&lt;1,1,1,1&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="99.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="105.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><line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="112.0234" y2="112.0234"/><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(#fx7ex62vymrd5)" 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><!--MD5=[82d054ff5ee7886739a7a142d9c3ddb9]
+link C_0000000208 to C_0000000197--><path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000000208-&gt;C_0000000197" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="885.81,285.1,890.71,305.71,874.02,292.66,885.81,285.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4c1844d761b634d455dac70ce9e90d59]
+link C_0000000209 to C_0000000197--><path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0000000209-&gt;C_0000000197" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="968.01,296.2,949.08,305.71,957.95,286.47,968.01,296.2" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1260521fd55315a4467cb0e93a411a3e]
+link C_0000000210 to C_0000000199--><path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0000000210-&gt;C_0000000199" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1223.76,291.07,1226.3,312.11,1211.2,297.25,1223.76,291.07" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dd69e911399e6ffd0cf2fd3f127bdc24]
+link C_0000000211 to C_0000000199--><path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000000211-&gt;C_0000000199" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="1270.45,297.14,1255.45,312.11,1257.85,291.05,1270.45,297.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9efa408e28a318b861aebcdfd7c2a610]
+link C_0000000212 to C_0000000203--><path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0000000212-&gt;C_0000000203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="260,292.11,253,312.11,246,292.11,260,292.11" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d0c4fa7b3eb40b3bec41b899876d601e]
+reverse link C_0000000207 to C_0000000208--><path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0000000207&lt;-C_0000000208" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="961.41,120.08,954.2275,120.722,952.0576,127.5988,959.2401,126.9569,961.41,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="925" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="935" y="163.0669">a1</text><!--MD5=[6f6d9305b310a36c6db9a8477caaa051]
+reverse link C_0000000207 to C_0000000209--><path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0000000207&lt;-C_0000000209" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1030,120.08,1026,126.08,1030,132.08,1034,126.08,1030,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1033" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1043" y="163.0669">a2</text><!--MD5=[594c361d9a23b8328dddf9404b062eb0]
+reverse link C_0000000207 to C_0000000210--><path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0000000207&lt;-C_0000000210" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1084.02,120.08,1085.3627,127.165,1092.4191,128.6506,1091.0764,121.5656,1084.02,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1132" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1142" y="163.0669">b1</text><!--MD5=[e8506067d82723d5f7d0eea7c0517dbc]
+reverse link C_0000000207 to C_0000000211--><path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0000000207&lt;-C_0000000211" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="1125.6,120.08,1128.8056,126.5394,1136.001,126.0649,1132.7955,119.6054,1125.6,120.08" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1207" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1217" y="163.0669">b2</text><!--MD5=[a07aa28d531b02ba167b2677262f0a06]
+reverse link C_0000000207 to C_0000000212--><path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0000000207&lt;-C_0000000212" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="783.35,114.2,776.6838,111.4501,771.5815,116.5458,778.2477,119.2957,783.35,114.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="598" y="156.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="608" y="163.0669">c1</text><!--MD5=[65fbe39b4d7148639caf48fb1887e393]
 @startuml
-class "A<T,Ts...>" as C_0000000176
-class C_0000000176 {
+
+class "A<T,Ts...>" as C_0000000197
+class C_0000000197 {
 -value : T
 -values : int
 }
 
-class "B<int Is...>" as C_0000000178
-class C_0000000178 {
+class "B<int Is...>" as C_0000000199
+class C_0000000199 {
 -ints : std::array<int,sizeof...(Is)>
 }
 
-class "C<T,int Is...>" as C_0000000182
-class C_0000000182 {
+class "C<T,int Is...>" as C_0000000203
+class C_0000000203 {
 -ints : std::array<T,sizeof...(Is)>
 }
 
-class "A<int,std::string,float>" as C_0000000187
-class C_0000000187 {
+class "A<int,std::string,float>" as C_0000000208
+class C_0000000208 {
 }
 
-class "A<int,std::string,bool>" as C_0000000188
-class C_0000000188 {
+class "A<int,std::string,bool>" as C_0000000209
+class C_0000000209 {
 }
 
-class "B<3,2,1>" as C_0000000189
-class C_0000000189 {
+class "B<3,2,1>" as C_0000000210
+class C_0000000210 {
 }
 
-class "B<1,1,1,1>" as C_0000000190
-class C_0000000190 {
+class "B<1,1,1,1>" as C_0000000211
+class C_0000000211 {
 }
 
-class "C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>" as C_0000000191
-class C_0000000191 {
+class "C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>" as C_0000000212
+class C_0000000212 {
 }
 
-class "R" as C_0000000186
-class C_0000000186 {
+class "R" as C_0000000207
+class C_0000000207 {
 -a1 : A<int,std::string,float>
 -a2 : A<int,std::string,bool>
 -b1 : B<3,2,1>
@@ -64,17 +65,17 @@ class C_0000000186 {
 -c1 : C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>
 }
 
-C_0000000187 ..|> C_0000000176
-C_0000000188 ..|> C_0000000176
-C_0000000189 ..|> C_0000000178
-C_0000000190 ..|> C_0000000178
-C_0000000191 ..|> C_0000000182
-C_0000000186 o- - C_0000000187 : -a1
-C_0000000186 o- - C_0000000188 : -a2
-C_0000000186 o- - C_0000000189 : -b1
-C_0000000186 o- - C_0000000190 : -b2
-C_0000000186 o- - C_0000000191 : -c1
-note right of C_0000000191 : Long template annotation
+C_0000000208 ..|> C_0000000197
+C_0000000209 ..|> C_0000000197
+C_0000000210 ..|> C_0000000199
+C_0000000211 ..|> C_0000000199
+C_0000000212 ..|> C_0000000203
+C_0000000207 o- - C_0000000208 : -a1
+C_0000000207 o- - C_0000000209 : -a2
+C_0000000207 o- - C_0000000210 : -b1
+C_0000000207 o- - C_0000000211 : -b2
+C_0000000207 o- - C_0000000212 : -c1
+note right of C_0000000212 : Long template annotation
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 32067de8..c6c989a1 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,73 +1,74 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:890px;height:493px;" version="1.1" viewBox="0 0 890 493" width="890px" zoomAndPan="magnify"><defs><filter height="300%" id="f14gdnm5tbbj9o" 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></defs><g><!--MD5=[8a3b6b560738631970580ea5ca1d77dc]
-class C_0000000207--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="60.8047" id="C_0000000207" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="405" y="422"/><ellipse cx="420" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M422.9688,443.6406 Q422.3906,443.9375 421.75,444.0781 Q421.1094,444.2344 420.4063,444.2344 Q417.9063,444.2344 416.5781,442.5938 Q415.2656,440.9375 415.2656,437.8125 Q415.2656,434.6875 416.5781,433.0313 Q417.9063,431.375 420.4063,431.375 Q421.1094,431.375 421.75,431.5313 Q422.4063,431.6875 422.9688,431.9844 L422.9688,434.7031 Q422.3438,434.125 421.75,433.8594 Q421.1563,433.5781 420.5313,433.5781 Q419.1875,433.5781 418.5,434.6563 Q417.8125,435.7188 417.8125,437.8125 Q417.8125,439.9063 418.5,440.9844 Q419.1875,442.0469 420.5313,442.0469 Q421.1563,442.0469 421.75,441.7813 Q422.3438,441.5 422.9688,440.9219 L422.9688,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="434" y="442.1543">ABCD::F</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="490" y="419"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="491" y="431.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="495" y1="454" y2="454"/><ellipse cx="416" cy="465" 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="23" x="425" y="468.2104">f : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="495" y1="474.8047" y2="474.8047"/><!--MD5=[121af0209425ebaf00ca487d61fcd64f]
-class C_0000000209--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="60.8047" id="C_0000000209" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="252" y="293.5"/><ellipse cx="275.55" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M278.5188,315.1406 Q277.9406,315.4375 277.3,315.5781 Q276.6594,315.7344 275.9563,315.7344 Q273.4563,315.7344 272.1281,314.0938 Q270.8156,312.4375 270.8156,309.3125 Q270.8156,306.1875 272.1281,304.5313 Q273.4563,302.875 275.9563,302.875 Q276.6594,302.875 277.3,303.0313 Q277.9563,303.1875 278.5188,303.4844 L278.5188,306.2031 Q277.8938,305.625 277.3,305.3594 Q276.7063,305.0781 276.0813,305.0781 Q274.7375,305.0781 274.05,306.1563 Q273.3625,307.2188 273.3625,309.3125 Q273.3625,311.4063 274.05,312.4844 Q274.7375,313.5469 276.0813,313.5469 Q276.7063,313.5469 277.3,313.2813 Q277.8938,313 278.5188,312.4219 L278.5188,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="291.45" y="313.6543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="253" x2="310" y1="325.5" y2="325.5"/><ellipse cx="263" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="272" y="339.7104">a : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="253" x2="310" y1="346.3047" y2="346.3047"/><!--MD5=[a3b06b7dcce083153dbb5c3591024ee7]
-class C_0000000211--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="60.8047" id="C_0000000211" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="346" y="293.5"/><ellipse cx="369.55" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M372.5188,315.1406 Q371.9406,315.4375 371.3,315.5781 Q370.6594,315.7344 369.9563,315.7344 Q367.4563,315.7344 366.1281,314.0938 Q364.8156,312.4375 364.8156,309.3125 Q364.8156,306.1875 366.1281,304.5313 Q367.4563,302.875 369.9563,302.875 Q370.6594,302.875 371.3,303.0313 Q371.9563,303.1875 372.5188,303.4844 L372.5188,306.2031 Q371.8938,305.625 371.3,305.3594 Q370.7063,305.0781 370.0813,305.0781 Q368.7375,305.0781 368.05,306.1563 Q367.3625,307.2188 367.3625,309.3125 Q367.3625,311.4063 368.05,312.4844 Q368.7375,313.5469 370.0813,313.5469 Q370.7063,313.5469 371.3,313.2813 Q371.8938,313 372.5188,312.4219 L372.5188,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385.45" y="313.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="404" y1="325.5" y2="325.5"/><ellipse cx="357" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="366" y="339.7104">b : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="404" y1="346.3047" y2="346.3047"/><!--MD5=[564cc83aa03b1b4846783d97662bffdf]
-class C_0000000213--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="60.8047" id="C_0000000213" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="440.5" y="293.5"/><ellipse cx="463.6" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M466.5688,315.1406 Q465.9906,315.4375 465.35,315.5781 Q464.7094,315.7344 464.0063,315.7344 Q461.5063,315.7344 460.1781,314.0938 Q458.8656,312.4375 458.8656,309.3125 Q458.8656,306.1875 460.1781,304.5313 Q461.5063,302.875 464.0063,302.875 Q464.7094,302.875 465.35,303.0313 Q466.0063,303.1875 466.5688,303.4844 L466.5688,306.2031 Q465.9438,305.625 465.35,305.3594 Q464.7563,305.0781 464.1313,305.0781 Q462.7875,305.0781 462.1,306.1563 Q461.4125,307.2188 461.4125,309.3125 Q461.4125,311.4063 462.1,312.4844 Q462.7875,313.5469 464.1313,313.5469 Q464.7563,313.5469 465.35,313.2813 Q465.9438,313 466.5688,312.4219 L466.5688,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.4" y="313.6543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="441.5" x2="497.5" y1="325.5" y2="325.5"/><ellipse cx="451.5" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="460.5" y="339.7104">c : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="441.5" x2="497.5" y1="346.3047" y2="346.3047"/><!--MD5=[e8734b8aa0128a0e983e426fabc1261d]
-class C_0000000215--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="73.6094" id="C_0000000215" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="6" y="287"/><ellipse cx="55.75" cy="303" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M58.7188,308.6406 Q58.1406,308.9375 57.5,309.0781 Q56.8594,309.2344 56.1563,309.2344 Q53.6563,309.2344 52.3281,307.5938 Q51.0156,305.9375 51.0156,302.8125 Q51.0156,299.6875 52.3281,298.0313 Q53.6563,296.375 56.1563,296.375 Q56.8594,296.375 57.5,296.5313 Q58.1563,296.6875 58.7188,296.9844 L58.7188,299.7031 Q58.0938,299.125 57.5,298.8594 Q56.9063,298.5781 56.2813,298.5781 Q54.9375,298.5781 54.25,299.6563 Q53.5625,300.7188 53.5625,302.8125 Q53.5625,304.9063 54.25,305.9844 Q54.9375,307.0469 56.2813,307.0469 Q56.9063,307.0469 57.5,306.7813 Q58.0938,306.5 58.7188,305.9219 L58.7188,308.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="76.25" y="307.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="122" y1="319" y2="319"/><ellipse cx="17" cy="330" 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="33" x="26" y="333.2104">d : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="122" y1="339.8047" y2="339.8047"/><ellipse cx="17" cy="350.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="91" x="26" y="354.0151">print(R* r) : void</text><!--MD5=[3fc4d97028fa364a1df35a7376a626c4]
-class C_0000000217--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="60.8047" id="C_0000000217" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="737.5" y="422"/><ellipse cx="752.95" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M755.9188,443.6406 Q755.3406,443.9375 754.7,444.0781 Q754.0594,444.2344 753.3563,444.2344 Q750.8563,444.2344 749.5281,442.5938 Q748.2156,440.9375 748.2156,437.8125 Q748.2156,434.6875 749.5281,433.0313 Q750.8563,431.375 753.3563,431.375 Q754.0594,431.375 754.7,431.5313 Q755.3563,431.6875 755.9188,431.9844 L755.9188,434.7031 Q755.2938,434.125 754.7,433.8594 Q754.1063,433.5781 753.4813,433.5781 Q752.1375,433.5781 751.45,434.6563 Q750.7625,435.7188 750.7625,437.8125 Q750.7625,439.9063 751.45,440.9844 Q752.1375,442.0469 753.4813,442.0469 Q754.1063,442.0469 754.7,441.7813 Q755.2938,441.5 755.9188,440.9219 L755.9188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="767.05" y="442.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="783.5" y="419"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="784.5" y="431.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="738.5" x2="788.5" y1="454" y2="454"/><ellipse cx="748.5" cy="465" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="757.5" y="468.2104">e : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="738.5" x2="788.5" y1="474.8047" y2="474.8047"/><!--MD5=[34cb47dad33bb94764ba8aa305db0dbf]
-class C_0000000220--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="48" id="C_0000000220" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="816.5" y="300"/><ellipse cx="831.5" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M834.4688,321.6406 Q833.8906,321.9375 833.25,322.0781 Q832.6094,322.2344 831.9063,322.2344 Q829.4063,322.2344 828.0781,320.5938 Q826.7656,318.9375 826.7656,315.8125 Q826.7656,312.6875 828.0781,311.0313 Q829.4063,309.375 831.9063,309.375 Q832.6094,309.375 833.25,309.5313 Q833.9063,309.6875 834.4688,309.9844 L834.4688,312.7031 Q833.8438,312.125 833.25,311.8594 Q832.6563,311.5781 832.0313,311.5781 Q830.6875,311.5781 830,312.6563 Q829.3125,313.7188 829.3125,315.8125 Q829.3125,317.9063 830,318.9844 Q830.6875,320.0469 832.0313,320.0469 Q832.6563,320.0469 833.25,319.7813 Q833.8438,319.5 834.4688,318.9219 L834.4688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="845.5" y="320.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="861.5" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="862.5" y="309.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="817.5" x2="875.5" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="817.5" x2="875.5" y1="340" y2="340"/><!--MD5=[d93f7adef6397fc8babdf1b2d179eb31]
-class C_0000000222--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="48" id="C_0000000222" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="158" y="300"/><ellipse cx="173" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M175.9688,321.6406 Q175.3906,321.9375 174.75,322.0781 Q174.1094,322.2344 173.4063,322.2344 Q170.9063,322.2344 169.5781,320.5938 Q168.2656,318.9375 168.2656,315.8125 Q168.2656,312.6875 169.5781,311.0313 Q170.9063,309.375 173.4063,309.375 Q174.1094,309.375 174.75,309.5313 Q175.4063,309.6875 175.9688,309.9844 L175.9688,312.7031 Q175.3438,312.125 174.75,311.8594 Q174.1563,311.5781 173.5313,311.5781 Q172.1875,311.5781 171.5,312.6563 Q170.8125,313.7188 170.8125,315.8125 Q170.8125,317.9063 171.5,318.9844 Q172.1875,320.0469 173.5313,320.0469 Q174.1563,320.0469 174.75,319.7813 Q175.3438,319.5 175.9688,318.9219 L175.9688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="187" y="320.1543">F</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="202" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="203" y="309.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="159" x2="216" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="159" x2="216" y1="340" y2="340"/><!--MD5=[4f4202d8d372fc046e20e0fb7263769b]
-class C_0000000223--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="48" id="C_0000000223" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="604.5" y="300"/><ellipse cx="619.5" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M622.4688,321.6406 Q621.8906,321.9375 621.25,322.0781 Q620.6094,322.2344 619.9063,322.2344 Q617.4063,322.2344 616.0781,320.5938 Q614.7656,318.9375 614.7656,315.8125 Q614.7656,312.6875 616.0781,311.0313 Q617.4063,309.375 619.9063,309.375 Q620.6094,309.375 621.25,309.5313 Q621.9063,309.6875 622.4688,309.9844 L622.4688,312.7031 Q621.8438,312.125 621.25,311.8594 Q620.6563,311.5781 620.0313,311.5781 Q618.6875,311.5781 618,312.6563 Q617.3125,313.7188 617.3125,315.8125 Q617.3125,317.9063 618,318.9844 Q618.6875,320.0469 620.0313,320.0469 Q620.6563,320.0469 621.25,319.7813 Q621.8438,319.5 622.4688,318.9219 L622.4688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="633.5" y="320.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="649.5" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="650.5" y="309.1387">std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="605.5" x2="709.5" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="605.5" x2="709.5" y1="340" y2="340"/><!--MD5=[4ec174012454b35711359f7e6a5e858d]
-class C_0000000219--><rect fill="#FEFECE" filter="url(#f14gdnm5tbbj9o)" height="201.6563" id="C_0000000219" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="319.5" y="8"/><ellipse cx="414.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M417.2188,29.6406 Q416.6406,29.9375 416,30.0781 Q415.3594,30.2344 414.6563,30.2344 Q412.1563,30.2344 410.8281,28.5938 Q409.5156,26.9375 409.5156,23.8125 Q409.5156,20.6875 410.8281,19.0313 Q412.1563,17.375 414.6563,17.375 Q415.3594,17.375 416,17.5313 Q416.6563,17.6875 417.2188,17.9844 L417.2188,20.7031 Q416.5938,20.125 416,19.8594 Q415.4063,19.5781 414.7813,19.5781 Q413.4375,19.5781 412.75,20.6563 Q412.0625,21.7188 412.0625,23.8125 Q412.0625,25.9063 412.75,26.9844 Q413.4375,28.0469 414.7813,28.0469 Q415.4063,28.0469 416,27.7813 Q416.5938,27.5 417.2188,26.9219 L417.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="320.5" x2="524.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="327.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="339.5" y="54.2104">estring : E&lt;std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="320.5" x2="524.5" y1="60.8047" y2="60.8047"/><ellipse cx="330.5" cy="71.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="89" x="339.5" y="75.0151">get_a(A* a) : int</text><ellipse cx="330.5" cy="84.6094" 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="94" x="339.5" y="87.8198">get_b(B&amp; b) : int</text><ellipse cx="330.5" cy="97.4141" 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="166" x="339.5" y="100.6245">get_const_b(B const&amp; b) : int</text><ellipse cx="330.5" cy="110.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="82" x="339.5" y="113.4292">get_c(C c) : int</text><ellipse cx="330.5" cy="123.0234" 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="104" x="339.5" y="126.2339">get_d(D&amp;&amp; d) : int</text><ellipse cx="330.5" cy="135.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="111" x="339.5" y="139.0386">get_d2(D&amp;&amp; d) : int</text><ellipse cx="330.5" cy="148.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="101" x="339.5" y="151.8433">get_e(E&lt;T&gt; e) : T</text><ellipse cx="330.5" cy="161.4375" 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="180" x="339.5" y="164.6479">get_int_e(E&lt;int&gt; const&amp; e) : int</text><ellipse cx="330.5" cy="174.2422" 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="152" x="339.5" y="177.4526">get_int_e2(E&lt;int&gt;&amp; e) : int</text><ellipse cx="330.5" cy="187.0469" 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="139" x="339.5" y="190.2573">get_f(F&lt;T&gt; const&amp; f) : T</text><ellipse cx="330.5" cy="199.8516" 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="173" x="339.5" y="203.062">get_int_f(F&lt;int&gt; const&amp; f) : int</text><!--MD5=[2561103a7c514a33cd0fb9d5f64511b1]
-link C_0000000215 to C_0000000219--><path d="M123.21,293.8 C175.22,265.03 252.08,219.93 314.98,181.61 " fill="none" id="C_0000000215-&gt;C_0000000219" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="319.48,178.86,309.7155,180.1465,315.2154,181.4701,313.8917,186.97,319.48,178.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[29aa2c477047f9609b3e0bb60bb5a3b1]
-link C_0000000219 to C_0000000215--><path d="M319.48,164.58 C254.33,201.98 172.84,250.7 119.63,284.18 " fill="none" id="C_0000000219-&gt;C_0000000215" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="115.21,286.97,124.9552,285.5448,119.4371,284.2995,120.6824,278.7814,115.21,286.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b98e75b6f9f0a0b9c1250ab290bf6b73]
-link C_0000000220 to C_0000000217--><path d="M831.28,348.2 C820.89,364.04 806.76,385.57 794.1,404.87 " fill="none" id="C_0000000220-&gt;C_0000000217" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="799.85,408.86,783.02,421.75,788.14,401.18,799.85,408.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6a8ab609cae3d3a8d5d62311b8d32510]
-link C_0000000222 to C_0000000207--><path d="M215.26,348.12 C221.4,352.69 228.01,357.24 234.5,361 C282.85,389.02 341.55,413.04 385.55,429.28 " fill="none" id="C_0000000222-&gt;C_0000000207" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="388.21,422.8,404.63,436.18,383.45,435.96,388.21,422.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[628697c029119c41d1b4b15c32aa37ed]
-link C_0000000223 to C_0000000217--><path d="M676.94,348.2 C690.55,364.44 709.17,386.67 725.66,406.34 " fill="none" id="C_0000000223-&gt;C_0000000217" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="731.09,401.92,738.57,421.75,720.36,410.91,731.09,401.92" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[cb8e1190436cc0f98d0396308ac410ab]
-link C_0000000219 to C_0000000209--><path d="M356.13,210.26 C337.38,238.59 318.24,267.5 304.04,288.96 " fill="none" id="C_0000000219-&gt;C_0000000209" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="301.26,293.14,309.5596,287.8374,304.017,288.9688,302.8856,283.4262,301.26,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f318983645bc61d9396a7e40954d2caf]
-link C_0000000219 to C_0000000211--><path d="M400.38,210.26 C394.2,238.23 387.91,266.78 383.19,288.15 " fill="none" id="C_0000000219-&gt;C_0000000211" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="382.09,293.14,387.9299,285.2093,383.164,288.2567,380.1166,283.4909,382.09,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[eb201f0c03688d9e4b061c0e82d0ca60]
-link C_0000000219 to C_0000000213--><path d="M444.62,210.26 C450.8,238.23 457.09,266.78 461.81,288.15 " fill="none" id="C_0000000219-&gt;C_0000000213" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="462.91,293.14,464.8834,283.4909,461.836,288.2567,457.0701,285.2093,462.91,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6206842a014b918c194edb895dcde772]
-link C_0000000219 to C_0000000217--><path d="M525.51,142.69 C594.3,170.06 680.63,216.21 728.5,287 C754.92,326.08 761.94,381.35 763.51,416.81 " fill="none" id="C_0000000219-&gt;C_0000000217" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="763.71,421.89,767.3722,412.7473,763.5239,416.8935,759.3778,413.0451,763.71,421.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1290c5c59c45c6a802c03bb2a5d36475]
-link C_0000000219 to C_0000000220--><path d="M525.81,128.46 C604.34,146.54 711.76,180.32 789.5,240 C808.55,254.62 823.56,277.45 833.39,295.46 " fill="none" id="C_0000000219-&gt;C_0000000220" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="835.78,299.93,835.0692,290.1068,833.4248,295.5194,828.0122,293.8751,835.78,299.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5594f142ce2e77d173b7c5fecf8a3a3b]
-link C_0000000219 to C_0000000207--><path d="M485.69,210.06 C497.99,234.35 509.06,260.88 515.5,287 C523.38,318.93 525.58,329.69 515.5,361 C508.78,381.88 495.26,402.02 482.28,417.98 " fill="none" id="C_0000000219-&gt;C_0000000207" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="479,421.94,487.8154,417.548,482.184,418.0849,481.6472,412.4536,479,421.94" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0073f16f1d4600bb144b3ee236b6d869]
-link C_0000000219 to C_0000000222--><path d="M319.43,203.42 C282.05,237.3 242.69,272.98 216.8,296.44 " fill="none" id="C_0000000219-&gt;C_0000000222" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="213.08,299.82,222.439,296.7526,216.7894,296.4673,217.0747,290.8176,213.08,299.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6d0b4c2f4b4d645825bfa83752dd4d41]
-reverse link C_0000000219 to C_0000000223--><path d="M535.48,202.35 C549.82,214.78 564.15,227.54 577.5,240 C598.28,259.39 620.62,282.81 636.4,299.82 " fill="none" id="C_0000000219&lt;-C_0000000223" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="525.55,193.81,527.4933,200.7543,534.6508,201.6314,532.7076,194.6871,525.55,193.81" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="595.5" y="246.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="605.5" y="253.0669">estring</text><!--MD5=[5e364642bcc39cfd7c89243fe0c155a7]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:890px;height:493px;" version="1.1" viewBox="0 0 890 493" width="890px" zoomAndPan="magnify"><defs><filter height="300%" id="fk6ipg1vg603v" 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></defs><g><!--MD5=[953963ee1a0b8fc9f9ba92b8ce25dc01]
+class C_0000000228--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="60.8047" id="C_0000000228" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="405" y="422"/><ellipse cx="420" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M422.9688,443.6406 Q422.3906,443.9375 421.75,444.0781 Q421.1094,444.2344 420.4063,444.2344 Q417.9063,444.2344 416.5781,442.5938 Q415.2656,440.9375 415.2656,437.8125 Q415.2656,434.6875 416.5781,433.0313 Q417.9063,431.375 420.4063,431.375 Q421.1094,431.375 421.75,431.5313 Q422.4063,431.6875 422.9688,431.9844 L422.9688,434.7031 Q422.3438,434.125 421.75,433.8594 Q421.1563,433.5781 420.5313,433.5781 Q419.1875,433.5781 418.5,434.6563 Q417.8125,435.7188 417.8125,437.8125 Q417.8125,439.9063 418.5,440.9844 Q419.1875,442.0469 420.5313,442.0469 Q421.1563,442.0469 421.75,441.7813 Q422.3438,441.5 422.9688,440.9219 L422.9688,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="434" y="442.1543">ABCD::F</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="490" y="419"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="491" y="431.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="495" y1="454" y2="454"/><ellipse cx="416" cy="465" 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="23" x="425" y="468.2104">f : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="495" y1="474.8047" y2="474.8047"/><!--MD5=[67348c11550f58d47e1683d55577277a]
+class C_0000000232--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="60.8047" id="C_0000000232" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="252" y="293.5"/><ellipse cx="275.55" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M278.5188,315.1406 Q277.9406,315.4375 277.3,315.5781 Q276.6594,315.7344 275.9563,315.7344 Q273.4563,315.7344 272.1281,314.0938 Q270.8156,312.4375 270.8156,309.3125 Q270.8156,306.1875 272.1281,304.5313 Q273.4563,302.875 275.9563,302.875 Q276.6594,302.875 277.3,303.0313 Q277.9563,303.1875 278.5188,303.4844 L278.5188,306.2031 Q277.8938,305.625 277.3,305.3594 Q276.7063,305.0781 276.0813,305.0781 Q274.7375,305.0781 274.05,306.1563 Q273.3625,307.2188 273.3625,309.3125 Q273.3625,311.4063 274.05,312.4844 Q274.7375,313.5469 276.0813,313.5469 Q276.7063,313.5469 277.3,313.2813 Q277.8938,313 278.5188,312.4219 L278.5188,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="291.45" y="313.6543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="253" x2="310" y1="325.5" y2="325.5"/><ellipse cx="263" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="272" y="339.7104">a : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="253" x2="310" y1="346.3047" y2="346.3047"/><!--MD5=[195673b26b3eb89eea972ff18040d7f2]
+class C_0000000234--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="60.8047" id="C_0000000234" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="346" y="293.5"/><ellipse cx="369.55" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M372.5188,315.1406 Q371.9406,315.4375 371.3,315.5781 Q370.6594,315.7344 369.9563,315.7344 Q367.4563,315.7344 366.1281,314.0938 Q364.8156,312.4375 364.8156,309.3125 Q364.8156,306.1875 366.1281,304.5313 Q367.4563,302.875 369.9563,302.875 Q370.6594,302.875 371.3,303.0313 Q371.9563,303.1875 372.5188,303.4844 L372.5188,306.2031 Q371.8938,305.625 371.3,305.3594 Q370.7063,305.0781 370.0813,305.0781 Q368.7375,305.0781 368.05,306.1563 Q367.3625,307.2188 367.3625,309.3125 Q367.3625,311.4063 368.05,312.4844 Q368.7375,313.5469 370.0813,313.5469 Q370.7063,313.5469 371.3,313.2813 Q371.8938,313 372.5188,312.4219 L372.5188,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385.45" y="313.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="404" y1="325.5" y2="325.5"/><ellipse cx="357" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="366" y="339.7104">b : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="404" y1="346.3047" y2="346.3047"/><!--MD5=[0e1ed6933b6dbbdaac7777feb069966b]
+class C_0000000236--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="60.8047" id="C_0000000236" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="440.5" y="293.5"/><ellipse cx="463.6" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M466.5688,315.1406 Q465.9906,315.4375 465.35,315.5781 Q464.7094,315.7344 464.0063,315.7344 Q461.5063,315.7344 460.1781,314.0938 Q458.8656,312.4375 458.8656,309.3125 Q458.8656,306.1875 460.1781,304.5313 Q461.5063,302.875 464.0063,302.875 Q464.7094,302.875 465.35,303.0313 Q466.0063,303.1875 466.5688,303.4844 L466.5688,306.2031 Q465.9438,305.625 465.35,305.3594 Q464.7563,305.0781 464.1313,305.0781 Q462.7875,305.0781 462.1,306.1563 Q461.4125,307.2188 461.4125,309.3125 Q461.4125,311.4063 462.1,312.4844 Q462.7875,313.5469 464.1313,313.5469 Q464.7563,313.5469 465.35,313.2813 Q465.9438,313 466.5688,312.4219 L466.5688,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.4" y="313.6543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="441.5" x2="497.5" y1="325.5" y2="325.5"/><ellipse cx="451.5" cy="336.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="460.5" y="339.7104">c : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="441.5" x2="497.5" y1="346.3047" y2="346.3047"/><!--MD5=[6aa8e12d17ba656583c343d78657b384]
+class C_0000000238--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="73.6094" id="C_0000000238" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="6" y="287"/><ellipse cx="55.75" cy="303" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M58.7188,308.6406 Q58.1406,308.9375 57.5,309.0781 Q56.8594,309.2344 56.1563,309.2344 Q53.6563,309.2344 52.3281,307.5938 Q51.0156,305.9375 51.0156,302.8125 Q51.0156,299.6875 52.3281,298.0313 Q53.6563,296.375 56.1563,296.375 Q56.8594,296.375 57.5,296.5313 Q58.1563,296.6875 58.7188,296.9844 L58.7188,299.7031 Q58.0938,299.125 57.5,298.8594 Q56.9063,298.5781 56.2813,298.5781 Q54.9375,298.5781 54.25,299.6563 Q53.5625,300.7188 53.5625,302.8125 Q53.5625,304.9063 54.25,305.9844 Q54.9375,307.0469 56.2813,307.0469 Q56.9063,307.0469 57.5,306.7813 Q58.0938,306.5 58.7188,305.9219 L58.7188,308.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="76.25" y="307.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="122" y1="319" y2="319"/><ellipse cx="17" cy="330" 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="33" x="26" y="333.2104">d : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="122" y1="339.8047" y2="339.8047"/><ellipse cx="17" cy="350.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="91" x="26" y="354.0151">print(R* r) : void</text><!--MD5=[5df0c936625988a849c6c36418dd5f26]
+class C_0000000240--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="60.8047" id="C_0000000240" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="737.5" y="422"/><ellipse cx="752.95" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M755.9188,443.6406 Q755.3406,443.9375 754.7,444.0781 Q754.0594,444.2344 753.3563,444.2344 Q750.8563,444.2344 749.5281,442.5938 Q748.2156,440.9375 748.2156,437.8125 Q748.2156,434.6875 749.5281,433.0313 Q750.8563,431.375 753.3563,431.375 Q754.0594,431.375 754.7,431.5313 Q755.3563,431.6875 755.9188,431.9844 L755.9188,434.7031 Q755.2938,434.125 754.7,433.8594 Q754.1063,433.5781 753.4813,433.5781 Q752.1375,433.5781 751.45,434.6563 Q750.7625,435.7188 750.7625,437.8125 Q750.7625,439.9063 751.45,440.9844 Q752.1375,442.0469 753.4813,442.0469 Q754.1063,442.0469 754.7,441.7813 Q755.2938,441.5 755.9188,440.9219 L755.9188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="767.05" y="442.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="783.5" y="419"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="784.5" y="431.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="738.5" x2="788.5" y1="454" y2="454"/><ellipse cx="748.5" cy="465" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="757.5" y="468.2104">e : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="738.5" x2="788.5" y1="474.8047" y2="474.8047"/><!--MD5=[5c99a591e3920de17505659085ae2148]
+class C_0000000243--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="48" id="C_0000000243" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="816.5" y="300"/><ellipse cx="831.5" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M834.4688,321.6406 Q833.8906,321.9375 833.25,322.0781 Q832.6094,322.2344 831.9063,322.2344 Q829.4063,322.2344 828.0781,320.5938 Q826.7656,318.9375 826.7656,315.8125 Q826.7656,312.6875 828.0781,311.0313 Q829.4063,309.375 831.9063,309.375 Q832.6094,309.375 833.25,309.5313 Q833.9063,309.6875 834.4688,309.9844 L834.4688,312.7031 Q833.8438,312.125 833.25,311.8594 Q832.6563,311.5781 832.0313,311.5781 Q830.6875,311.5781 830,312.6563 Q829.3125,313.7188 829.3125,315.8125 Q829.3125,317.9063 830,318.9844 Q830.6875,320.0469 832.0313,320.0469 Q832.6563,320.0469 833.25,319.7813 Q833.8438,319.5 834.4688,318.9219 L834.4688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="845.5" y="320.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="861.5" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="862.5" y="309.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="817.5" x2="875.5" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="817.5" x2="875.5" y1="340" y2="340"/><!--MD5=[7fd7c59e33401ed2f17ab190eac57853]
+class C_0000000245--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="48" id="C_0000000245" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="158" y="300"/><ellipse cx="173" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M175.9688,321.6406 Q175.3906,321.9375 174.75,322.0781 Q174.1094,322.2344 173.4063,322.2344 Q170.9063,322.2344 169.5781,320.5938 Q168.2656,318.9375 168.2656,315.8125 Q168.2656,312.6875 169.5781,311.0313 Q170.9063,309.375 173.4063,309.375 Q174.1094,309.375 174.75,309.5313 Q175.4063,309.6875 175.9688,309.9844 L175.9688,312.7031 Q175.3438,312.125 174.75,311.8594 Q174.1563,311.5781 173.5313,311.5781 Q172.1875,311.5781 171.5,312.6563 Q170.8125,313.7188 170.8125,315.8125 Q170.8125,317.9063 171.5,318.9844 Q172.1875,320.0469 173.5313,320.0469 Q174.1563,320.0469 174.75,319.7813 Q175.3438,319.5 175.9688,318.9219 L175.9688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="187" y="320.1543">F</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="202" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="203" y="309.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="159" x2="216" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="159" x2="216" y1="340" y2="340"/><!--MD5=[5f509e90e1f9c43bbb458856bd9707f0]
+class C_0000000246--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="48" id="C_0000000246" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="604.5" y="300"/><ellipse cx="619.5" cy="316" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M622.4688,321.6406 Q621.8906,321.9375 621.25,322.0781 Q620.6094,322.2344 619.9063,322.2344 Q617.4063,322.2344 616.0781,320.5938 Q614.7656,318.9375 614.7656,315.8125 Q614.7656,312.6875 616.0781,311.0313 Q617.4063,309.375 619.9063,309.375 Q620.6094,309.375 621.25,309.5313 Q621.9063,309.6875 622.4688,309.9844 L622.4688,312.7031 Q621.8438,312.125 621.25,311.8594 Q620.6563,311.5781 620.0313,311.5781 Q618.6875,311.5781 618,312.6563 Q617.3125,313.7188 617.3125,315.8125 Q617.3125,317.9063 618,318.9844 Q618.6875,320.0469 620.0313,320.0469 Q620.6563,320.0469 621.25,319.7813 Q621.8438,319.5 622.4688,318.9219 L622.4688,321.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="633.5" y="320.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="649.5" y="297"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="650.5" y="309.1387">std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="605.5" x2="709.5" y1="332" y2="332"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="605.5" x2="709.5" y1="340" y2="340"/><!--MD5=[0b5c59fe176cc62a90ab936a119dd56a]
+class C_0000000242--><rect fill="#FEFECE" filter="url(#fk6ipg1vg603v)" height="201.6563" id="C_0000000242" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="319.5" y="8"/><ellipse cx="414.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M417.2188,29.6406 Q416.6406,29.9375 416,30.0781 Q415.3594,30.2344 414.6563,30.2344 Q412.1563,30.2344 410.8281,28.5938 Q409.5156,26.9375 409.5156,23.8125 Q409.5156,20.6875 410.8281,19.0313 Q412.1563,17.375 414.6563,17.375 Q415.3594,17.375 416,17.5313 Q416.6563,17.6875 417.2188,17.9844 L417.2188,20.7031 Q416.5938,20.125 416,19.8594 Q415.4063,19.5781 414.7813,19.5781 Q413.4375,19.5781 412.75,20.6563 Q412.0625,21.7188 412.0625,23.8125 Q412.0625,25.9063 412.75,26.9844 Q413.4375,28.0469 414.7813,28.0469 Q415.4063,28.0469 416,27.7813 Q416.5938,27.5 417.2188,26.9219 L417.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="320.5" x2="524.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="327.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="339.5" y="54.2104">estring : E&lt;std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="320.5" x2="524.5" y1="60.8047" y2="60.8047"/><ellipse cx="330.5" cy="71.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="89" x="339.5" y="75.0151">get_a(A* a) : int</text><ellipse cx="330.5" cy="84.6094" 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="94" x="339.5" y="87.8198">get_b(B&amp; b) : int</text><ellipse cx="330.5" cy="97.4141" 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="166" x="339.5" y="100.6245">get_const_b(B const&amp; b) : int</text><ellipse cx="330.5" cy="110.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="82" x="339.5" y="113.4292">get_c(C c) : int</text><ellipse cx="330.5" cy="123.0234" 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="104" x="339.5" y="126.2339">get_d(D&amp;&amp; d) : int</text><ellipse cx="330.5" cy="135.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="111" x="339.5" y="139.0386">get_d2(D&amp;&amp; d) : int</text><ellipse cx="330.5" cy="148.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="101" x="339.5" y="151.8433">get_e(E&lt;T&gt; e) : T</text><ellipse cx="330.5" cy="161.4375" 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="180" x="339.5" y="164.6479">get_int_e(E&lt;int&gt; const&amp; e) : int</text><ellipse cx="330.5" cy="174.2422" 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="152" x="339.5" y="177.4526">get_int_e2(E&lt;int&gt;&amp; e) : int</text><ellipse cx="330.5" cy="187.0469" 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="139" x="339.5" y="190.2573">get_f(F&lt;T&gt; const&amp; f) : T</text><ellipse cx="330.5" cy="199.8516" 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="173" x="339.5" y="203.062">get_int_f(F&lt;int&gt; const&amp; f) : int</text><!--MD5=[0fc948a8a6e8b0428b9e0160102e7449]
+link C_0000000238 to C_0000000242--><path d="M123.21,293.8 C175.22,265.03 252.08,219.93 314.98,181.61 " fill="none" id="C_0000000238-&gt;C_0000000242" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="319.48,178.86,309.7155,180.1465,315.2154,181.4701,313.8917,186.97,319.48,178.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[63fa1647d6ee549be84cf9cdbe7d747d]
+link C_0000000242 to C_0000000238--><path d="M319.48,164.58 C254.33,201.98 172.84,250.7 119.63,284.18 " fill="none" id="C_0000000242-&gt;C_0000000238" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="115.21,286.97,124.9552,285.5448,119.4371,284.2995,120.6824,278.7814,115.21,286.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dbe41d5eca9635f29bbd9952cb2b1e17]
+link C_0000000243 to C_0000000240--><path d="M831.28,348.2 C820.89,364.04 806.76,385.57 794.1,404.87 " fill="none" id="C_0000000243-&gt;C_0000000240" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="799.85,408.86,783.02,421.75,788.14,401.18,799.85,408.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[30999b9bff8cae8aff69470cdcae09a0]
+link C_0000000245 to C_0000000228--><path d="M215.26,348.12 C221.4,352.69 228.01,357.24 234.5,361 C282.85,389.02 341.55,413.04 385.55,429.28 " fill="none" id="C_0000000245-&gt;C_0000000228" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="388.21,422.8,404.63,436.18,383.45,435.96,388.21,422.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[446b1576e5cb219c395b7229fd845afd]
+link C_0000000246 to C_0000000240--><path d="M676.94,348.2 C690.55,364.44 709.17,386.67 725.66,406.34 " fill="none" id="C_0000000246-&gt;C_0000000240" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="731.09,401.92,738.57,421.75,720.36,410.91,731.09,401.92" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e313773939aa4eb3a4a85af213be1a8e]
+link C_0000000242 to C_0000000232--><path d="M356.13,210.26 C337.38,238.59 318.24,267.5 304.04,288.96 " fill="none" id="C_0000000242-&gt;C_0000000232" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="301.26,293.14,309.5596,287.8374,304.017,288.9688,302.8856,283.4262,301.26,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1b3a520dc0bd89b9fb0facc2daea662c]
+link C_0000000242 to C_0000000234--><path d="M400.38,210.26 C394.2,238.23 387.91,266.78 383.19,288.15 " fill="none" id="C_0000000242-&gt;C_0000000234" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="382.09,293.14,387.9299,285.2093,383.164,288.2567,380.1166,283.4909,382.09,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c13b2133770ed9f2e6e4e672e8cbf1ac]
+link C_0000000242 to C_0000000236--><path d="M444.62,210.26 C450.8,238.23 457.09,266.78 461.81,288.15 " fill="none" id="C_0000000242-&gt;C_0000000236" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="462.91,293.14,464.8834,283.4909,461.836,288.2567,457.0701,285.2093,462.91,293.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[202c7e19c00c59c378f44fa98956dbd4]
+link C_0000000242 to C_0000000240--><path d="M525.51,142.69 C594.3,170.06 680.63,216.21 728.5,287 C754.92,326.08 761.94,381.35 763.51,416.81 " fill="none" id="C_0000000242-&gt;C_0000000240" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="763.71,421.89,767.3722,412.7473,763.5239,416.8935,759.3778,413.0451,763.71,421.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7887891dc1143719ba34fcaae82b14d1]
+link C_0000000242 to C_0000000243--><path d="M525.81,128.46 C604.34,146.54 711.76,180.32 789.5,240 C808.55,254.62 823.56,277.45 833.39,295.46 " fill="none" id="C_0000000242-&gt;C_0000000243" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="835.78,299.93,835.0692,290.1068,833.4248,295.5194,828.0122,293.8751,835.78,299.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9118ecf0ad09fa17135af0108381ee8e]
+link C_0000000242 to C_0000000228--><path d="M485.69,210.06 C497.99,234.35 509.06,260.88 515.5,287 C523.38,318.93 525.58,329.69 515.5,361 C508.78,381.88 495.26,402.02 482.28,417.98 " fill="none" id="C_0000000242-&gt;C_0000000228" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="479,421.94,487.8154,417.548,482.184,418.0849,481.6472,412.4536,479,421.94" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[69f7f0a57a174a7e8b05efe11b8b0b76]
+link C_0000000242 to C_0000000245--><path d="M319.43,203.42 C282.05,237.3 242.69,272.98 216.8,296.44 " fill="none" id="C_0000000242-&gt;C_0000000245" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="213.08,299.82,222.439,296.7526,216.7894,296.4673,217.0747,290.8176,213.08,299.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4c6246c7f16ed9adb9463d0532f8ec06]
+reverse link C_0000000242 to C_0000000246--><path d="M535.48,202.35 C549.82,214.78 564.15,227.54 577.5,240 C598.28,259.39 620.62,282.81 636.4,299.82 " fill="none" id="C_0000000242&lt;-C_0000000246" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="525.55,193.81,527.4933,200.7543,534.6508,201.6314,532.7076,194.6871,525.55,193.81" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="595.5" y="246.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="605.5" y="253.0669">estring</text><!--MD5=[71a09daa79ca0b4c172a641f6abad651]
 @startuml
-class "ABCD::F<T>" as C_0000000207
-class C_0000000207 {
+class "ABCD::F<T>" as C_0000000228
+class C_0000000228 {
 +f : T
 }
 
-class "A" as C_0000000209
-class C_0000000209 {
+
+class "A" as C_0000000232
+class C_0000000232 {
 +a : int
 }
 
-class "B" as C_0000000211
-class C_0000000211 {
+class "B" as C_0000000234
+class C_0000000234 {
 +b : int
 }
 
-class "C" as C_0000000213
-class C_0000000213 {
+class "C" as C_0000000236
+class C_0000000236 {
 +c : int
 }
 
-class "D" as C_0000000215
-class C_0000000215 {
+class "D" as C_0000000238
+class C_0000000238 {
 +print(R* r) : void
 +d : int
 }
 
-class "E<T>" as C_0000000217
-class C_0000000217 {
+class "E<T>" as C_0000000240
+class C_0000000240 {
 +e : T
 }
 
-class "E<int>" as C_0000000220
-class C_0000000220 {
+class "E<int>" as C_0000000243
+class C_0000000243 {
 }
 
-class "F<int>" as C_0000000222
-class C_0000000222 {
+class "F<int>" as C_0000000245
+class C_0000000245 {
 }
 
-class "E<std::string>" as C_0000000223
-class C_0000000223 {
+class "E<std::string>" as C_0000000246
+class C_0000000246 {
 }
 
-class "R" as C_0000000219
-class C_0000000219 {
+class "R" as C_0000000242
+class C_0000000242 {
 +get_a(A* a) : int
 +get_b(B& b) : int
 +get_const_b(B const& b) : int
@@ -82,19 +83,19 @@ class C_0000000219 {
 -estring : E<std::string>
 }
 
-C_0000000215 ..> C_0000000219
-C_0000000220 ..|> C_0000000217
-C_0000000222 ..|> C_0000000207
-C_0000000223 ..|> C_0000000217
-C_0000000219 ..> C_0000000209
-C_0000000219 ..> C_0000000211
-C_0000000219 ..> C_0000000213
-C_0000000219 ..> C_0000000215
-C_0000000219 ..> C_0000000217
-C_0000000219 ..> C_0000000220
-C_0000000219 ..> C_0000000207
-C_0000000219 ..> C_0000000222
-C_0000000219 o- - C_0000000223 : -estring
+C_0000000238 ..> C_0000000242
+C_0000000243 ..|> C_0000000240
+C_0000000245 ..|> C_0000000228
+C_0000000246 ..|> C_0000000240
+C_0000000242 ..> C_0000000232
+C_0000000242 ..> C_0000000234
+C_0000000242 ..> C_0000000236
+C_0000000242 ..> C_0000000238
+C_0000000242 ..> C_0000000240
+C_0000000242 ..> C_0000000243
+C_0000000242 ..> C_0000000228
+C_0000000242 ..> C_0000000245
+C_0000000242 o- - C_0000000246 : -estring
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index c1663dae..461ae116 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,69 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="597px" preserveAspectRatio="none" style="width:1086px;height:597px;" version="1.1" viewBox="0 0 1086 597" width="1086px" zoomAndPan="magnify"><defs><filter height="300%" id="f2zhoactrdhgk" 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></defs><g><!--MD5=[7a67464c529391ac392a902141ea7226]
-class C_0000000229--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="73.6094" id="C_0000000229" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="257.5" y="513"/><ellipse cx="272.5" cy="529" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M275.4688,534.6406 Q274.8906,534.9375 274.25,535.0781 Q273.6094,535.2344 272.9063,535.2344 Q270.4063,535.2344 269.0781,533.5938 Q267.7656,531.9375 267.7656,528.8125 Q267.7656,525.6875 269.0781,524.0313 Q270.4063,522.375 272.9063,522.375 Q273.6094,522.375 274.25,522.5313 Q274.9063,522.6875 275.4688,522.9844 L275.4688,525.7031 Q274.8438,525.125 274.25,524.8594 Q273.6563,524.5781 273.0313,524.5781 Q271.6875,524.5781 271,525.6563 Q270.3125,526.7188 270.3125,528.8125 Q270.3125,530.9063 271,531.9844 Q271.6875,533.0469 273.0313,533.0469 Q273.6563,533.0469 274.25,532.7813 Q274.8438,532.5 275.4688,531.9219 L275.4688,534.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="286.5" y="533.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="302.5" y="510"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="303.5" y="522.1387">T,P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="258.5" x2="318.5" y1="545" y2="545"/><ellipse cx="268.5" cy="556" 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="23" x="277.5" y="559.2104">t : T</text><ellipse cx="268.5" cy="568.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="277.5" y="572.0151">p : P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="258.5" x2="318.5" y1="578.6094" y2="578.6094"/><!--MD5=[f36c9821a2dcb4a74a667ccf3b5a2a89]
-class C_0000000231--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000231" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="329" y="404"/><ellipse cx="344" cy="420" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M346.9688,425.6406 Q346.3906,425.9375 345.75,426.0781 Q345.1094,426.2344 344.4063,426.2344 Q341.9063,426.2344 340.5781,424.5938 Q339.2656,422.9375 339.2656,419.8125 Q339.2656,416.6875 340.5781,415.0313 Q341.9063,413.375 344.4063,413.375 Q345.1094,413.375 345.75,413.5313 Q346.4063,413.6875 346.9688,413.9844 L346.9688,416.7031 Q346.3438,416.125 345.75,415.8594 Q345.1563,415.5781 344.5313,415.5781 Q343.1875,415.5781 342.5,416.6563 Q341.8125,417.7188 341.8125,419.8125 Q341.8125,421.9063 342.5,422.9844 Q343.1875,424.0469 344.5313,424.0469 Q345.1563,424.0469 345.75,423.7813 Q346.3438,423.5 346.9688,422.9219 L346.9688,425.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="358" y="424.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="374" y="401"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="375" y="413.1387">T,std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330" x2="445" y1="436" y2="436"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="330" x2="445" y1="444" y2="444"/><!--MD5=[bd6e41bcbd2cff2cade25780a7066486]
-class C_0000000235--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="60.8047" id="C_0000000235" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="6" y="235"/><ellipse cx="61.25" cy="251" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M64.2188,256.6406 Q63.6406,256.9375 63,257.0781 Q62.3594,257.2344 61.6563,257.2344 Q59.1563,257.2344 57.8281,255.5938 Q56.5156,253.9375 56.5156,250.8125 Q56.5156,247.6875 57.8281,246.0313 Q59.1563,244.375 61.6563,244.375 Q62.3594,244.375 63,244.5313 Q63.6563,244.6875 64.2188,244.9844 L64.2188,247.7031 Q63.5938,247.125 63,246.8594 Q62.4063,246.5781 61.7813,246.5781 Q60.4375,246.5781 59.75,247.6563 Q59.0625,248.7188 59.0625,250.8125 Q59.0625,252.9063 59.75,253.9844 Q60.4375,255.0469 61.7813,255.0469 Q62.4063,255.0469 63,254.7813 Q63.5938,254.5 64.2188,253.9219 L64.2188,256.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81.75" y="255.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="132" y1="267" y2="267"/><ellipse cx="17" cy="278" 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="101" x="26" y="281.2104">value : std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="132" y1="287.8047" y2="287.8047"/><!--MD5=[6aa8e12d17ba656583c343d78657b384]
-class C_0000000238--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000238" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="164" y="326"/><ellipse cx="179" cy="342" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M181.9688,347.6406 Q181.3906,347.9375 180.75,348.0781 Q180.1094,348.2344 179.4063,348.2344 Q176.9063,348.2344 175.5781,346.5938 Q174.2656,344.9375 174.2656,341.8125 Q174.2656,338.6875 175.5781,337.0313 Q176.9063,335.375 179.4063,335.375 Q180.1094,335.375 180.75,335.5313 Q181.4063,335.6875 181.9688,335.9844 L181.9688,338.7031 Q181.3438,338.125 180.75,337.8594 Q180.1563,337.5781 179.5313,337.5781 Q178.1875,337.5781 177.5,338.6563 Q176.8125,339.7188 176.8125,341.8125 Q176.8125,343.9063 177.5,344.9844 Q178.1875,346.0469 179.5313,346.0469 Q180.1563,346.0469 180.75,345.7813 Q181.3438,345.5 181.9688,344.9219 L181.9688,347.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="346.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="209" y="323"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="210" y="335.1387">bool,std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="300" y1="358" y2="358"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="300" y1="366" y2="366"/><!--MD5=[1faddf569aaca8f2b3c2792f9452a64f]
-class C_0000000239--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000239" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="254" y="241.5"/><ellipse cx="269" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M271.9688,263.1406 Q271.3906,263.4375 270.75,263.5781 Q270.1094,263.7344 269.4063,263.7344 Q266.9063,263.7344 265.5781,262.0938 Q264.2656,260.4375 264.2656,257.3125 Q264.2656,254.1875 265.5781,252.5313 Q266.9063,250.875 269.4063,250.875 Q270.1094,250.875 270.75,251.0313 Q271.4063,251.1875 271.9688,251.4844 L271.9688,254.2031 Q271.3438,253.625 270.75,253.3594 Q270.1563,253.0781 269.5313,253.0781 Q268.1875,253.0781 267.5,254.1563 Q266.8125,255.2188 266.8125,257.3125 Q266.8125,259.4063 267.5,260.4844 Q268.1875,261.5469 269.5313,261.5469 Q270.1563,261.5469 270.75,261.2813 Q271.3438,261 271.9688,260.4219 L271.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="283" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="336" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="337" y="250.6387">float</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="255" x2="362" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="255" x2="362" y1="281.5" y2="281.5"/><!--MD5=[5df0c936625988a849c6c36418dd5f26]
-class C_0000000240--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000240" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="398" y="241.5"/><ellipse cx="413" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M415.9688,263.1406 Q415.3906,263.4375 414.75,263.5781 Q414.1094,263.7344 413.4063,263.7344 Q410.9063,263.7344 409.5781,262.0938 Q408.2656,260.4375 408.2656,257.3125 Q408.2656,254.1875 409.5781,252.5313 Q410.9063,250.875 413.4063,250.875 Q414.1094,250.875 414.75,251.0313 Q415.4063,251.1875 415.9688,251.4844 L415.9688,254.2031 Q415.3438,253.625 414.75,253.3594 Q414.1563,253.0781 413.5313,253.0781 Q412.1875,253.0781 411.5,254.1563 Q410.8125,255.2188 410.8125,257.3125 Q410.8125,259.4063 411.5,260.4844 Q412.1875,261.5469 413.5313,261.5469 Q414.1563,261.5469 414.75,261.2813 Q415.3438,261 415.9688,260.4219 L415.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="427" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="480" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="250.6387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="494" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="494" y1="281.5" y2="281.5"/><!--MD5=[b4b6bdf55de8fd824ed723b7b13e9f5a]
-class C_0000000241--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000241" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="530" y="241.5"/><ellipse cx="545" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M547.9688,263.1406 Q547.3906,263.4375 546.75,263.5781 Q546.1094,263.7344 545.4063,263.7344 Q542.9063,263.7344 541.5781,262.0938 Q540.2656,260.4375 540.2656,257.3125 Q540.2656,254.1875 541.5781,252.5313 Q542.9063,250.875 545.4063,250.875 Q546.1094,250.875 546.75,251.0313 Q547.4063,251.1875 547.9688,251.4844 L547.9688,254.2031 Q547.3438,253.625 546.75,253.3594 Q546.1563,253.0781 545.5313,253.0781 Q544.1875,253.0781 543.5,254.1563 Q542.8125,255.2188 542.8125,257.3125 Q542.8125,259.4063 543.5,260.4844 Q544.1875,261.5469 545.5313,261.5469 Q546.1563,261.5469 546.75,261.2813 Q547.3438,261 547.9688,260.4219 L547.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="559" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="612" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="613" y="250.6387">std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="531" x2="672" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="531" x2="672" y1="281.5" y2="281.5"/><!--MD5=[7010c6e86d6dd7bd25a252fb04944e77]
-class C_0000000244--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000244" style="stroke: #A80036; stroke-width: 1.5;" width="199" x="708" y="241.5"/><ellipse cx="723" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M725.9688,263.1406 Q725.3906,263.4375 724.75,263.5781 Q724.1094,263.7344 723.4063,263.7344 Q720.9063,263.7344 719.5781,262.0938 Q718.2656,260.4375 718.2656,257.3125 Q718.2656,254.1875 719.5781,252.5313 Q720.9063,250.875 723.4063,250.875 Q724.1094,250.875 724.75,251.0313 Q725.4063,251.1875 725.9688,251.4844 L725.9688,254.2031 Q725.3438,253.625 724.75,253.3594 Q724.1563,253.0781 723.5313,253.0781 Q722.1875,253.0781 721.5,254.1563 Q720.8125,255.2188 720.8125,257.3125 Q720.8125,259.4063 721.5,260.4844 Q722.1875,261.5469 723.5313,261.5469 Q724.1563,261.5469 724.75,261.2813 Q725.3438,261 725.9688,260.4219 L725.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="101" x="737" y="261.6543">GeneralCallback</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="846" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="847" y="250.6387">AIntString</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="709" x2="906" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="709" x2="906" y1="281.5" y2="281.5"/><!--MD5=[7fd7c59e33401ed2f17ab190eac57853]
-class C_0000000245--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="48" id="C_0000000245" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="942" y="241.5"/><ellipse cx="957" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M959.9688,263.1406 Q959.3906,263.4375 958.75,263.5781 Q958.1094,263.7344 957.4063,263.7344 Q954.9063,263.7344 953.5781,262.0938 Q952.2656,260.4375 952.2656,257.3125 Q952.2656,254.1875 953.5781,252.5313 Q954.9063,250.875 957.4063,250.875 Q958.1094,250.875 958.75,251.0313 Q959.4063,251.1875 959.9688,251.4844 L959.9688,254.2031 Q959.3438,253.625 958.75,253.3594 Q958.1563,253.0781 957.5313,253.0781 Q956.1875,253.0781 955.5,254.1563 Q954.8125,255.2188 954.8125,257.3125 Q954.8125,259.4063 955.5,260.4844 Q956.1875,261.5469 957.5313,261.5469 Q958.1563,261.5469 958.75,261.2813 Q959.3438,261 959.9688,260.4219 L959.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="101" x="971" y="261.6543">GeneralCallback</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="1074" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="1074" y1="281.5" y2="281.5"/><!--MD5=[9170b7b4ed0ab50a1f80e6a6ba645ffd]
-class C_0000000237--><rect fill="#FEFECE" filter="url(#f2zhoactrdhgk)" height="150.4375" id="C_0000000237" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="271.5" y="8"/><ellipse cx="371.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M374.2188,29.6406 Q373.6406,29.9375 373,30.0781 Q372.3594,30.2344 371.6563,30.2344 Q369.1563,30.2344 367.8281,28.5938 Q366.5156,26.9375 366.5156,23.8125 Q366.5156,20.6875 367.8281,19.0313 Q369.1563,17.375 371.6563,17.375 Q372.3594,17.375 373,17.5313 Q373.6563,17.6875 374.2188,17.9844 L374.2188,20.7031 Q373.5938,20.125 373,19.8594 Q372.4063,19.5781 371.7813,19.5781 Q370.4375,19.5781 369.75,20.6563 Q369.0625,21.7188 369.0625,23.8125 Q369.0625,25.9063 369.75,26.9844 Q370.4375,28.0469 371.7813,28.0469 Q372.4063,28.0469 373,27.7813 Q373.5938,27.5 374.2188,26.9219 L374.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="391.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="272.5" x2="486.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="291.5" y="54.2104">boolstring : A&lt;bool,std::string&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="291.5" y="67.0151">floatstring : AString&lt;float&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="291.5" y="79.8198">intstring : AIntString</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="291.5" y="92.6245">stringstring : AStringString</text><polygon fill="none" points="282.5,97.2188,286.5,101.2188,282.5,105.2188,278.5,101.2188" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="291.5" y="105.4292">bs : BVector</text><ellipse cx="282.5" cy="115.0234" 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="84" x="291.5" y="118.2339">bs2 : BVector2</text><ellipse cx="282.5" cy="127.8281" 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="190" x="291.5" y="131.0386">cb : GeneralCallback&lt;AIntString&gt;</text><ellipse cx="282.5" cy="140.6328" 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="102" x="291.5" y="143.8433">vcb : VoidCallback</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="272.5" x2="486.5" y1="150.4375" y2="150.4375"/><!--MD5=[adb744e86fff43b1bd6dcb8b412a871a]
-link C_0000000231 to C_0000000229--><path d="M368.41,452.14 C357.9,464.88 344.41,481.23 331.51,496.86 " fill="none" id="C_0000000231-&gt;C_0000000229" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="336.57,501.74,318.44,512.71,325.77,492.83,336.57,501.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ef6fe17dcafb4e8118fd419c9515ff42]
-link C_0000000238 to C_0000000229--><path d="M239.03,374.1 C247.26,403.2 261.68,454.17 272.83,493.6 " fill="none" id="C_0000000238-&gt;C_0000000229" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="279.61,491.85,278.32,513,266.14,495.66,279.61,491.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[636589f7a15e881548673038b7302915]
-link C_0000000239 to C_0000000231--><path d="M319.99,289.84 C332.31,314.87 352.12,355.13 367.11,385.57 " fill="none" id="C_0000000239-&gt;C_0000000231" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="373.58,382.86,376.13,403.89,361.01,389.04,373.58,382.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c70a0fa131332b8889f3910c7c3bb323]
-link C_0000000240 to C_0000000231--><path d="M437.92,289.84 C428.81,314.63 414.2,354.36 403.05,384.69 " fill="none" id="C_0000000240-&gt;C_0000000231" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="409.46,387.54,395.99,403.89,396.32,382.71,409.46,387.54" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ee4cb9bb1da8083a894de3cc070f5b9c]
-link C_0000000241 to C_0000000231--><path d="M570.38,289.84 C534.7,316.6 475.82,360.76 434.54,391.72 " fill="none" id="C_0000000241-&gt;C_0000000231" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="438.51,397.49,418.31,403.89,430.11,386.29,438.51,397.49" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[fa1b5c29bbdabb9ca1cc1e249bcb3047]
-reverse link C_0000000237 to C_0000000238--><path d="M262.19,161.34 C254.7,169.63 247.98,178.52 242.5,188 C217.41,231.4 222.52,292.82 227.86,325.84 " fill="none" id="C_0000000237&lt;-C_0000000238" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.31,151.9,264.2642,153.435,262.9711,160.5292,270.0169,158.9942,271.31,151.9" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="245.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="255.5" y="201.0669">boolstring</text><!--MD5=[5d5683182c04e42ea5022e15e9125182]
-reverse link C_0000000237 to C_0000000239--><path d="M340.55,170.28 C338.1,176.25 335.72,182.2 333.5,188 C326.75,205.61 320.16,225.92 315.45,241.19 " fill="none" id="C_0000000237&lt;-C_0000000239" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="345.67,158.04,339.6659,162.0339,341.0434,169.1122,347.0474,165.1183,345.67,158.04" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="336.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="346.5" y="201.0669">floatstring</text><!--MD5=[4a8cce05e8b0df08bd4a061fe41dad1c]
-reverse link C_0000000237 to C_0000000240--><path d="M411.61,170.5 C421.27,196.54 431.09,222.99 437.84,241.17 " fill="none" id="C_0000000237&lt;-C_0000000240" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="407.04,158.2,405.3807,165.2176,411.2202,169.4484,412.8796,162.4308,407.04,158.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="426.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="436.5" y="201.0669">intstring</text><!--MD5=[e0198a6db046178cd121137deb100ade]
-reverse link C_0000000237 to C_0000000241--><path d="M481.15,166.65 C514.79,194 549.59,222.3 573.06,241.38 " fill="none" id="C_0000000237&lt;-C_0000000241" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="470.76,158.2,472.8921,165.0887,480.0709,165.7701,477.9388,158.8814,470.76,158.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="526.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="72" x="536.5" y="201.0669">stringstring</text><!--MD5=[73c7e5fa59b2066e3954ba3176d8e60b]
-reverse link C_0000000237 to C_0000000235--><path d="M258.54,106.85 C175.79,125.21 76.69,153.59 51.5,188 C41.59,201.54 45.36,219.73 51.95,234.98 " fill="none" id="C_0000000237&lt;-C_0000000235" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.4,104.04,264.6857,101.4096,259.6753,106.5957,266.3896,109.2261,271.4,104.04" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="57.5,192.0664,61.5,196.0664,57.5,200.0664,53.5,196.0664" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="64.5" y="201.0669">bs</text><!--MD5=[73c7e5fa59b2066e3954ba3176d8e60b]
-reverse link C_0000000237 to C_0000000235--><path d="M258.94,115.59 C212.31,131.9 160.63,155.39 120.5,188 C105.01,200.58 92.49,219.12 83.73,234.79 " fill="none" id="C_0000000237&lt;-C_0000000235-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.3,111.38,264.3319,109.5237,259.9384,115.2419,266.9065,117.0981,271.3,111.38" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="126.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="133.5" y="201.0669">bs2</text><!--MD5=[9ff287166b40af405f8b1fe051557b0d]
-reverse link C_0000000237 to C_0000000244--><path d="M499.58,134.64 C582.67,169.68 689.31,214.66 752.81,241.44 " fill="none" id="C_0000000237&lt;-C_0000000244" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="487.5,129.55,491.4705,135.5695,498.5542,134.2197,494.5836,128.2001,487.5,129.55" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="663.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="670.5" y="201.0669">cb</text><!--MD5=[79d53e716c649c3be1d5445061adad4f]
-reverse link C_0000000237 to C_0000000245--><path d="M500.57,115.04 C611.47,144.06 779.87,189.62 924.5,235 C930.84,236.99 937.42,239.14 943.98,241.35 " fill="none" id="C_0000000237&lt;-C_0000000245" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="487.67,111.67,492.465,117.0559,499.2808,114.7012,494.4858,109.3153,487.67,111.67" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="827.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="22" x="834.5" y="201.0669">vcb</text><!--MD5=[19a54a8cd90270f59846c9a67ac02341]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="597px" preserveAspectRatio="none" style="width:1086px;height:597px;" version="1.1" viewBox="0 0 1086 597" width="1086px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kamzgq1pv6nm" 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></defs><g><!--MD5=[db2dd4e147083ab619764869ce9d274f]
+class C_0000000254--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="73.6094" id="C_0000000254" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="257.5" y="513"/><ellipse cx="272.5" cy="529" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M275.4688,534.6406 Q274.8906,534.9375 274.25,535.0781 Q273.6094,535.2344 272.9063,535.2344 Q270.4063,535.2344 269.0781,533.5938 Q267.7656,531.9375 267.7656,528.8125 Q267.7656,525.6875 269.0781,524.0313 Q270.4063,522.375 272.9063,522.375 Q273.6094,522.375 274.25,522.5313 Q274.9063,522.6875 275.4688,522.9844 L275.4688,525.7031 Q274.8438,525.125 274.25,524.8594 Q273.6563,524.5781 273.0313,524.5781 Q271.6875,524.5781 271,525.6563 Q270.3125,526.7188 270.3125,528.8125 Q270.3125,530.9063 271,531.9844 Q271.6875,533.0469 273.0313,533.0469 Q273.6563,533.0469 274.25,532.7813 Q274.8438,532.5 275.4688,531.9219 L275.4688,534.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="286.5" y="533.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="302.5" y="510"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="303.5" y="522.1387">T,P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="258.5" x2="318.5" y1="545" y2="545"/><ellipse cx="268.5" cy="556" 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="23" x="277.5" y="559.2104">t : T</text><ellipse cx="268.5" cy="568.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="277.5" y="572.0151">p : P</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="258.5" x2="318.5" y1="578.6094" y2="578.6094"/><!--MD5=[77baa3cc2341fd8a3a75eea9a7ae1aa1]
+class C_0000000256--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000256" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="329" y="404"/><ellipse cx="344" cy="420" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M346.9688,425.6406 Q346.3906,425.9375 345.75,426.0781 Q345.1094,426.2344 344.4063,426.2344 Q341.9063,426.2344 340.5781,424.5938 Q339.2656,422.9375 339.2656,419.8125 Q339.2656,416.6875 340.5781,415.0313 Q341.9063,413.375 344.4063,413.375 Q345.1094,413.375 345.75,413.5313 Q346.4063,413.6875 346.9688,413.9844 L346.9688,416.7031 Q346.3438,416.125 345.75,415.8594 Q345.1563,415.5781 344.5313,415.5781 Q343.1875,415.5781 342.5,416.6563 Q341.8125,417.7188 341.8125,419.8125 Q341.8125,421.9063 342.5,422.9844 Q343.1875,424.0469 344.5313,424.0469 Q345.1563,424.0469 345.75,423.7813 Q346.3438,423.5 346.9688,422.9219 L346.9688,425.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="358" y="424.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="374" y="401"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="375" y="413.1387">T,std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330" x2="445" y1="436" y2="436"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="330" x2="445" y1="444" y2="444"/><!--MD5=[a662c9678bc137329127fe4bbe04fe1a]
+class C_0000000260--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="60.8047" id="C_0000000260" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="6" y="235"/><ellipse cx="61.25" cy="251" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M64.2188,256.6406 Q63.6406,256.9375 63,257.0781 Q62.3594,257.2344 61.6563,257.2344 Q59.1563,257.2344 57.8281,255.5938 Q56.5156,253.9375 56.5156,250.8125 Q56.5156,247.6875 57.8281,246.0313 Q59.1563,244.375 61.6563,244.375 Q62.3594,244.375 63,244.5313 Q63.6563,244.6875 64.2188,244.9844 L64.2188,247.7031 Q63.5938,247.125 63,246.8594 Q62.4063,246.5781 61.7813,246.5781 Q60.4375,246.5781 59.75,247.6563 Q59.0625,248.7188 59.0625,250.8125 Q59.0625,252.9063 59.75,253.9844 Q60.4375,255.0469 61.7813,255.0469 Q62.4063,255.0469 63,254.7813 Q63.5938,254.5 64.2188,253.9219 L64.2188,256.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81.75" y="255.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="132" y1="267" y2="267"/><ellipse cx="17" cy="278" 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="101" x="26" y="281.2104">value : std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="132" y1="287.8047" y2="287.8047"/><!--MD5=[a7bc8bf0370525cd033942bb9bc010b8]
+class C_0000000263--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000263" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="164" y="326"/><ellipse cx="179" cy="342" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M181.9688,347.6406 Q181.3906,347.9375 180.75,348.0781 Q180.1094,348.2344 179.4063,348.2344 Q176.9063,348.2344 175.5781,346.5938 Q174.2656,344.9375 174.2656,341.8125 Q174.2656,338.6875 175.5781,337.0313 Q176.9063,335.375 179.4063,335.375 Q180.1094,335.375 180.75,335.5313 Q181.4063,335.6875 181.9688,335.9844 L181.9688,338.7031 Q181.3438,338.125 180.75,337.8594 Q180.1563,337.5781 179.5313,337.5781 Q178.1875,337.5781 177.5,338.6563 Q176.8125,339.7188 176.8125,341.8125 Q176.8125,343.9063 177.5,344.9844 Q178.1875,346.0469 179.5313,346.0469 Q180.1563,346.0469 180.75,345.7813 Q181.3438,345.5 181.9688,344.9219 L181.9688,347.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="346.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="209" y="323"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="210" y="335.1387">bool,std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="300" y1="358" y2="358"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="300" y1="366" y2="366"/><!--MD5=[53119661c16b18ef89ea7dd8bb7f280f]
+class C_0000000264--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000264" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="254" y="241.5"/><ellipse cx="269" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M271.9688,263.1406 Q271.3906,263.4375 270.75,263.5781 Q270.1094,263.7344 269.4063,263.7344 Q266.9063,263.7344 265.5781,262.0938 Q264.2656,260.4375 264.2656,257.3125 Q264.2656,254.1875 265.5781,252.5313 Q266.9063,250.875 269.4063,250.875 Q270.1094,250.875 270.75,251.0313 Q271.4063,251.1875 271.9688,251.4844 L271.9688,254.2031 Q271.3438,253.625 270.75,253.3594 Q270.1563,253.0781 269.5313,253.0781 Q268.1875,253.0781 267.5,254.1563 Q266.8125,255.2188 266.8125,257.3125 Q266.8125,259.4063 267.5,260.4844 Q268.1875,261.5469 269.5313,261.5469 Q270.1563,261.5469 270.75,261.2813 Q271.3438,261 271.9688,260.4219 L271.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="283" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="336" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="337" y="250.6387">float</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="255" x2="362" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="255" x2="362" y1="281.5" y2="281.5"/><!--MD5=[8a59e263209345442cb22c04fa284a66]
+class C_0000000265--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000265" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="398" y="241.5"/><ellipse cx="413" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M415.9688,263.1406 Q415.3906,263.4375 414.75,263.5781 Q414.1094,263.7344 413.4063,263.7344 Q410.9063,263.7344 409.5781,262.0938 Q408.2656,260.4375 408.2656,257.3125 Q408.2656,254.1875 409.5781,252.5313 Q410.9063,250.875 413.4063,250.875 Q414.1094,250.875 414.75,251.0313 Q415.4063,251.1875 415.9688,251.4844 L415.9688,254.2031 Q415.3438,253.625 414.75,253.3594 Q414.1563,253.0781 413.5313,253.0781 Q412.1875,253.0781 411.5,254.1563 Q410.8125,255.2188 410.8125,257.3125 Q410.8125,259.4063 411.5,260.4844 Q412.1875,261.5469 413.5313,261.5469 Q414.1563,261.5469 414.75,261.2813 Q415.3438,261 415.9688,260.4219 L415.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="427" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="480" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="250.6387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="494" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="494" y1="281.5" y2="281.5"/><!--MD5=[802c82e61e33275329a8b940e3764a5f]
+class C_0000000266--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000266" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="530" y="241.5"/><ellipse cx="545" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M547.9688,263.1406 Q547.3906,263.4375 546.75,263.5781 Q546.1094,263.7344 545.4063,263.7344 Q542.9063,263.7344 541.5781,262.0938 Q540.2656,260.4375 540.2656,257.3125 Q540.2656,254.1875 541.5781,252.5313 Q542.9063,250.875 545.4063,250.875 Q546.1094,250.875 546.75,251.0313 Q547.4063,251.1875 547.9688,251.4844 L547.9688,254.2031 Q547.3438,253.625 546.75,253.3594 Q546.1563,253.0781 545.5313,253.0781 Q544.1875,253.0781 543.5,254.1563 Q542.8125,255.2188 542.8125,257.3125 Q542.8125,259.4063 543.5,260.4844 Q544.1875,261.5469 545.5313,261.5469 Q546.1563,261.5469 546.75,261.2813 Q547.3438,261 547.9688,260.4219 L547.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="559" y="261.6543">AString</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="612" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="613" y="250.6387">std::string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="531" x2="672" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="531" x2="672" y1="281.5" y2="281.5"/><!--MD5=[97a039539e26061b7bdd977a07ac25e1]
+class C_0000000269--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000269" style="stroke: #A80036; stroke-width: 1.5;" width="199" x="708" y="241.5"/><ellipse cx="723" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M725.9688,263.1406 Q725.3906,263.4375 724.75,263.5781 Q724.1094,263.7344 723.4063,263.7344 Q720.9063,263.7344 719.5781,262.0938 Q718.2656,260.4375 718.2656,257.3125 Q718.2656,254.1875 719.5781,252.5313 Q720.9063,250.875 723.4063,250.875 Q724.1094,250.875 724.75,251.0313 Q725.4063,251.1875 725.9688,251.4844 L725.9688,254.2031 Q725.3438,253.625 724.75,253.3594 Q724.1563,253.0781 723.5313,253.0781 Q722.1875,253.0781 721.5,254.1563 Q720.8125,255.2188 720.8125,257.3125 Q720.8125,259.4063 721.5,260.4844 Q722.1875,261.5469 723.5313,261.5469 Q724.1563,261.5469 724.75,261.2813 Q725.3438,261 725.9688,260.4219 L725.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="101" x="737" y="261.6543">GeneralCallback</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="846" y="238.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="847" y="250.6387">AIntString</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="709" x2="906" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="709" x2="906" y1="281.5" y2="281.5"/><!--MD5=[bdca1a72b25ed814fa1855adb00d821f]
+class C_0000000270--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="48" id="C_0000000270" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="942" y="241.5"/><ellipse cx="957" cy="257.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M959.9688,263.1406 Q959.3906,263.4375 958.75,263.5781 Q958.1094,263.7344 957.4063,263.7344 Q954.9063,263.7344 953.5781,262.0938 Q952.2656,260.4375 952.2656,257.3125 Q952.2656,254.1875 953.5781,252.5313 Q954.9063,250.875 957.4063,250.875 Q958.1094,250.875 958.75,251.0313 Q959.4063,251.1875 959.9688,251.4844 L959.9688,254.2031 Q959.3438,253.625 958.75,253.3594 Q958.1563,253.0781 957.5313,253.0781 Q956.1875,253.0781 955.5,254.1563 Q954.8125,255.2188 954.8125,257.3125 Q954.8125,259.4063 955.5,260.4844 Q956.1875,261.5469 957.5313,261.5469 Q958.1563,261.5469 958.75,261.2813 Q959.3438,261 959.9688,260.4219 L959.9688,263.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="101" x="971" y="261.6543">GeneralCallback</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="1074" y1="273.5" y2="273.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="1074" y1="281.5" y2="281.5"/><!--MD5=[1422097a4a12da311b183fc947928507]
+class C_0000000262--><rect fill="#FEFECE" filter="url(#f1kamzgq1pv6nm)" height="150.4375" id="C_0000000262" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="271.5" y="8"/><ellipse cx="371.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M374.2188,29.6406 Q373.6406,29.9375 373,30.0781 Q372.3594,30.2344 371.6563,30.2344 Q369.1563,30.2344 367.8281,28.5938 Q366.5156,26.9375 366.5156,23.8125 Q366.5156,20.6875 367.8281,19.0313 Q369.1563,17.375 371.6563,17.375 Q372.3594,17.375 373,17.5313 Q373.6563,17.6875 374.2188,17.9844 L374.2188,20.7031 Q373.5938,20.125 373,19.8594 Q372.4063,19.5781 371.7813,19.5781 Q370.4375,19.5781 369.75,20.6563 Q369.0625,21.7188 369.0625,23.8125 Q369.0625,25.9063 369.75,26.9844 Q370.4375,28.0469 371.7813,28.0469 Q372.4063,28.0469 373,27.7813 Q373.5938,27.5 374.2188,26.9219 L374.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="391.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="272.5" x2="486.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="291.5" y="54.2104">boolstring : A&lt;bool,std::string&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="291.5" y="67.0151">floatstring : AString&lt;float&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="291.5" y="79.8198">intstring : AIntString</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="279.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="291.5" y="92.6245">stringstring : AStringString</text><polygon fill="none" points="282.5,97.2188,286.5,101.2188,282.5,105.2188,278.5,101.2188" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="291.5" y="105.4292">bs : BVector</text><ellipse cx="282.5" cy="115.0234" 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="84" x="291.5" y="118.2339">bs2 : BVector2</text><ellipse cx="282.5" cy="127.8281" 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="190" x="291.5" y="131.0386">cb : GeneralCallback&lt;AIntString&gt;</text><ellipse cx="282.5" cy="140.6328" 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="102" x="291.5" y="143.8433">vcb : VoidCallback</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="272.5" x2="486.5" y1="150.4375" y2="150.4375"/><!--MD5=[fab1a0c4cea4e04aa64f29d8a4afd395]
+link C_0000000256 to C_0000000254--><path d="M368.41,452.14 C357.9,464.88 344.41,481.23 331.51,496.86 " fill="none" id="C_0000000256-&gt;C_0000000254" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="336.57,501.74,318.44,512.71,325.77,492.83,336.57,501.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8492e64afe917f43a273062156602098]
+link C_0000000263 to C_0000000254--><path d="M239.03,374.1 C247.26,403.2 261.68,454.17 272.83,493.6 " fill="none" id="C_0000000263-&gt;C_0000000254" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="279.61,491.85,278.32,513,266.14,495.66,279.61,491.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b6fc38eec0206fff81915b6eaf6635bc]
+link C_0000000264 to C_0000000256--><path d="M319.99,289.84 C332.31,314.87 352.12,355.13 367.11,385.57 " fill="none" id="C_0000000264-&gt;C_0000000256" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="373.58,382.86,376.13,403.89,361.01,389.04,373.58,382.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a1dcc6c190af1f0a527a35a6501748b5]
+link C_0000000265 to C_0000000256--><path d="M437.92,289.84 C428.81,314.63 414.2,354.36 403.05,384.69 " fill="none" id="C_0000000265-&gt;C_0000000256" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="409.46,387.54,395.99,403.89,396.32,382.71,409.46,387.54" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bfac2a46e5d3873df0fee8ad73413d5b]
+link C_0000000266 to C_0000000256--><path d="M570.38,289.84 C534.7,316.6 475.82,360.76 434.54,391.72 " fill="none" id="C_0000000266-&gt;C_0000000256" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="438.51,397.49,418.31,403.89,430.11,386.29,438.51,397.49" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[66622645604f9c1791c24826a22b30b5]
+reverse link C_0000000262 to C_0000000263--><path d="M262.19,161.34 C254.7,169.63 247.98,178.52 242.5,188 C217.41,231.4 222.52,292.82 227.86,325.84 " fill="none" id="C_0000000262&lt;-C_0000000263" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.31,151.9,264.2642,153.435,262.9711,160.5292,270.0169,158.9942,271.31,151.9" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="245.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="255.5" y="201.0669">boolstring</text><!--MD5=[710c11fa4359f80350b7efdfde96aaea]
+reverse link C_0000000262 to C_0000000264--><path d="M340.55,170.28 C338.1,176.25 335.72,182.2 333.5,188 C326.75,205.61 320.16,225.92 315.45,241.19 " fill="none" id="C_0000000262&lt;-C_0000000264" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="345.67,158.04,339.6659,162.0339,341.0434,169.1122,347.0474,165.1183,345.67,158.04" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="336.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="346.5" y="201.0669">floatstring</text><!--MD5=[d5b754a899385b7a7a61ae982e073a8d]
+reverse link C_0000000262 to C_0000000265--><path d="M411.61,170.5 C421.27,196.54 431.09,222.99 437.84,241.17 " fill="none" id="C_0000000262&lt;-C_0000000265" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="407.04,158.2,405.3807,165.2176,411.2202,169.4484,412.8796,162.4308,407.04,158.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="426.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="436.5" y="201.0669">intstring</text><!--MD5=[c949801263b107fafe9116428fb0b985]
+reverse link C_0000000262 to C_0000000266--><path d="M481.15,166.65 C514.79,194 549.59,222.3 573.06,241.38 " fill="none" id="C_0000000262&lt;-C_0000000266" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="470.76,158.2,472.8921,165.0887,480.0709,165.7701,477.9388,158.8814,470.76,158.2" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="526.5" y="194.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="72" x="536.5" y="201.0669">stringstring</text><!--MD5=[342ef789ac11ff088b79f0148c517785]
+reverse link C_0000000262 to C_0000000260--><path d="M258.54,106.85 C175.79,125.21 76.69,153.59 51.5,188 C41.59,201.54 45.36,219.73 51.95,234.98 " fill="none" id="C_0000000262&lt;-C_0000000260" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.4,104.04,264.6857,101.4096,259.6753,106.5957,266.3896,109.2261,271.4,104.04" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="57.5,192.0664,61.5,196.0664,57.5,200.0664,53.5,196.0664" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="64.5" y="201.0669">bs</text><!--MD5=[342ef789ac11ff088b79f0148c517785]
+reverse link C_0000000262 to C_0000000260--><path d="M258.94,115.59 C212.31,131.9 160.63,155.39 120.5,188 C105.01,200.58 92.49,219.12 83.73,234.79 " fill="none" id="C_0000000262&lt;-C_0000000260-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="271.3,111.38,264.3319,109.5237,259.9384,115.2419,266.9065,117.0981,271.3,111.38" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="126.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="133.5" y="201.0669">bs2</text><!--MD5=[b2954ef2dd18a1ba09e62ea637d0bb8c]
+reverse link C_0000000262 to C_0000000269--><path d="M499.58,134.64 C582.67,169.68 689.31,214.66 752.81,241.44 " fill="none" id="C_0000000262&lt;-C_0000000269" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="487.5,129.55,491.4705,135.5695,498.5542,134.2197,494.5836,128.2001,487.5,129.55" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="663.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="670.5" y="201.0669">cb</text><!--MD5=[0946197fe7074c9423f28463ed686563]
+reverse link C_0000000262 to C_0000000270--><path d="M500.57,115.04 C611.47,144.06 779.87,189.62 924.5,235 C930.84,236.99 937.42,239.14 943.98,241.35 " fill="none" id="C_0000000262&lt;-C_0000000270" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="487.67,111.67,492.465,117.0559,499.2808,114.7012,494.4858,109.3153,487.67,111.67" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="827.5" cy="197.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="22" x="834.5" y="201.0669">vcb</text><!--MD5=[2a3f71af1b24662479edca7d76d1dac8]
 @startuml
-class "A<T,P>" as C_0000000229
-class C_0000000229 {
+
+class "A<T,P>" as C_0000000254
+class C_0000000254 {
 +t : T
 +p : P
 }
 
-class "A<T,std::string>" as C_0000000231
-class C_0000000231 {
+class "A<T,std::string>" as C_0000000256
+class C_0000000256 {
 }
 
-class "B" as C_0000000235
-class C_0000000235 {
+class "B" as C_0000000260
+class C_0000000260 {
 +value : std::string
 }
 
-class "A<bool,std::string>" as C_0000000238
-class C_0000000238 {
+class "A<bool,std::string>" as C_0000000263
+class C_0000000263 {
 }
 
-class "AString<float>" as C_0000000239
-class C_0000000239 {
+class "AString<float>" as C_0000000264
+class C_0000000264 {
 }
 
-class "AString<int>" as C_0000000240
-class C_0000000240 {
+class "AString<int>" as C_0000000265
+class C_0000000265 {
 }
 
-class "AString<std::string>" as C_0000000241
-class C_0000000241 {
+class "AString<std::string>" as C_0000000266
+class C_0000000266 {
 }
 
-class "GeneralCallback<AIntString>" as C_0000000244
-class C_0000000244 {
+class "GeneralCallback<AIntString>" as C_0000000269
+class C_0000000269 {
 }
 
-class "GeneralCallback" as C_0000000245
-class C_0000000245 {
+class "GeneralCallback" as C_0000000270
+class C_0000000270 {
 }
 
-class "R" as C_0000000237
-class C_0000000237 {
+class "R" as C_0000000262
+class C_0000000262 {
 -boolstring : A<bool,std::string>
 -floatstring : AString<float>
 -intstring : AIntString
@@ -74,19 +75,19 @@ class C_0000000237 {
 +vcb : VoidCallback
 }
 
-C_0000000231 ..|> C_0000000229
-C_0000000238 ..|> C_0000000229
-C_0000000239 ..|> C_0000000231
-C_0000000240 ..|> C_0000000231
-C_0000000241 ..|> C_0000000231
-C_0000000237 o- - C_0000000238 : -boolstring
-C_0000000237 o- - C_0000000239 : -floatstring
-C_0000000237 o- - C_0000000240 : -intstring
-C_0000000237 o- - C_0000000241 : -stringstring
-C_0000000237 o- - C_0000000235 : #bs
-C_0000000237 o- - C_0000000235 : +bs2
-C_0000000237 o- - C_0000000244 : +cb
-C_0000000237 o- - C_0000000245 : +vcb
+C_0000000256 ..|> C_0000000254
+C_0000000263 ..|> C_0000000254
+C_0000000264 ..|> C_0000000256
+C_0000000265 ..|> C_0000000256
+C_0000000266 ..|> C_0000000256
+C_0000000262 o- - C_0000000263 : -boolstring
+C_0000000262 o- - C_0000000264 : -floatstring
+C_0000000262 o- - C_0000000265 : -intstring
+C_0000000262 o- - C_0000000266 : -stringstring
+C_0000000262 o- - C_0000000260 : #bs
+C_0000000262 o- - C_0000000260 : +bs2
+C_0000000262 o- - C_0000000269 : +cb
+C_0000000262 o- - C_0000000270 : +vcb
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 20121288..48ecd9ce 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,33 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f8v3jqp486kp3" 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></defs><g><!--MD5=[77baa3cc2341fd8a3a75eea9a7ae1aa1]
-class C_0000000256--><rect fill="#FEFECE" filter="url(#f8v3jqp486kp3)" height="48" id="C_0000000256" 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"/><!--MD5=[8eebe634abdeaabf3af549fb18e7cacf]
-class C_0000000259--><rect fill="#FEFECE" filter="url(#f8v3jqp486kp3)" height="48" id="C_0000000259" 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"/><!--MD5=[08e85592f5291fae36d5a833459643bb]
-class C_0000000261--><rect fill="#FEFECE" filter="url(#f8v3jqp486kp3)" height="48" id="C_0000000261" 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"/><!--MD5=[802c82e61e33275329a8b940e3764a5f]
-class C_0000000266--><rect fill="#FEFECE" filter="url(#f8v3jqp486kp3)" height="48" id="C_0000000266" 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"/><!--MD5=[cfdb8c760729d8afc57c9c0b7941a06c]
-class C_0000000268--><rect fill="#FEFECE" filter="url(#f8v3jqp486kp3)" height="48" id="C_0000000268" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="256" y2="256"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="264" y2="264"/><!--MD5=[cd34c77caf3ee78f0e2a7f29f9eb1350]
-reverse link C_0000000256 to C_0000000261--><path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0000000256&lt;-C_0000000261" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="98.51,67.75,116.14,56,109.68,76.18,98.51,67.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[cb1b283b3319d897bb214ca60711e40b]
-reverse link C_0000000256 to C_0000000266--><path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0000000256&lt;-C_0000000266" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="157.66,76.14,151.08,56,168.78,67.64,157.66,76.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dffe94a730a2188b12fb8d2c2f1693d0]
-reverse link C_0000000266 to C_0000000268--><path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0000000266&lt;-C_0000000268" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="207.5,184,214.5,164,221.5,184,207.5,184" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d43a47d402a7a8b71ef270da6c184139]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f100umddkce0gb" 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></defs><g><!--MD5=[0a46c5dad8d91c1a2d633428847bf9e9]
+class C_0000000283--><rect fill="#FEFECE" filter="url(#f100umddkce0gb)" height="48" id="C_0000000283" 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"/><!--MD5=[475669b486667b2ac73175e07ce1b6da]
+class C_0000000286--><rect fill="#FEFECE" filter="url(#f100umddkce0gb)" height="48" id="C_0000000286" 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"/><!--MD5=[b8197fd92442f70c1b9037b0c8cc5bd1]
+class C_0000000288--><rect fill="#FEFECE" filter="url(#f100umddkce0gb)" height="48" id="C_0000000288" 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"/><!--MD5=[2bad4618bda115190fc1c2b1ce95ea14]
+class C_0000000293--><rect fill="#FEFECE" filter="url(#f100umddkce0gb)" height="48" id="C_0000000293" 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"/><!--MD5=[f06d54724a7b747141b0b1e83beefa30]
+class C_0000000295--><rect fill="#FEFECE" filter="url(#f100umddkce0gb)" height="48" id="C_0000000295" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="256" y2="256"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="264" y2="264"/><!--MD5=[07ee5b6d51b2901299634cdee2e63cf9]
+reverse link C_0000000283 to C_0000000288--><path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0000000283&lt;-C_0000000288" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="98.51,67.75,116.14,56,109.68,76.18,98.51,67.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4a66bafc1ebae8967549ef1380da2187]
+reverse link C_0000000283 to C_0000000293--><path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0000000283&lt;-C_0000000293" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="157.66,76.14,151.08,56,168.78,67.64,157.66,76.14" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[61655f785fc14f93eeb42cda6917dcff]
+reverse link C_0000000293 to C_0000000295--><path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0000000293&lt;-C_0000000295" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="207.5,184,214.5,164,221.5,184,207.5,184" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c4a3ae303c4ab3412789a7361fe38f3f]
 @startuml
-class "ns1::A" as C_0000000256
-class C_0000000256 {
-}
-class "ns1::ns2_v0_9_0::A" as C_0000000259
-class C_0000000259 {
-}
-class "ns1::Anon" as C_0000000261
-class C_0000000261 {
-}
-C_0000000256 <|- - C_0000000261
 
-class "ns3::ns1::ns2::Anon" as C_0000000266
-class C_0000000266 {
+class "ns1::A" as C_0000000283
+class C_0000000283 {
 }
-C_0000000256 <|- - C_0000000266
-class "ns3::B" as C_0000000268
-class C_0000000268 {
+class "ns1::ns2_v0_9_0::A" as C_0000000286
+class C_0000000286 {
+}
+class "ns1::Anon" as C_0000000288
+class C_0000000288 {
 }
-C_0000000266 <|- - C_0000000268
 
+class "ns3::ns1::ns2::Anon" as C_0000000293
+class C_0000000293 {
+}
+class "ns3::B" as C_0000000295
+class C_0000000295 {
+}
+
+C_0000000283 <|- - C_0000000288
+C_0000000283 <|- - C_0000000293
+C_0000000293 <|- - C_0000000295
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index 493a6979..ed7797a1 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,43 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:694px;height:200px;" version="1.1" viewBox="0 0 694 200" width="694px" zoomAndPan="magnify"><defs><filter height="300%" id="fzihnr85upmwk" 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></defs><g><!--MD5=[bdca1a72b25ed814fa1855adb00d821f]
-class C_0000000270--><rect fill="#FEFECE" filter="url(#fzihnr85upmwk)" height="60.8047" id="C_0000000270" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="303" y="129"/><ellipse cx="318" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M320.9688,150.6406 Q320.3906,150.9375 319.75,151.0781 Q319.1094,151.2344 318.4063,151.2344 Q315.9063,151.2344 314.5781,149.5938 Q313.2656,147.9375 313.2656,144.8125 Q313.2656,141.6875 314.5781,140.0313 Q315.9063,138.375 318.4063,138.375 Q319.1094,138.375 319.75,138.5313 Q320.4063,138.6875 320.9688,138.9844 L320.9688,141.7031 Q320.3438,141.125 319.75,140.8594 Q319.1563,140.5781 318.5313,140.5781 Q317.1875,140.5781 316.5,141.6563 Q315.8125,142.7188 315.8125,144.8125 Q315.8125,146.9063 316.5,147.9844 Q317.1875,149.0469 318.5313,149.0469 Q319.1563,149.0469 319.75,148.7813 Q320.3438,148.5 320.9688,147.9219 L320.9688,150.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="332" y="149.1543">is_numeric&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="304" x2="420" y1="161" y2="161"/><ellipse cx="314" cy="172" 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="323" y="175.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="304" x2="420" y1="181.8047" y2="181.8047"/><!--MD5=[c24277762f48a5c3cfa48e8ca1e66836]
-class C_0000000272--><rect fill="#FEFECE" filter="url(#fzihnr85upmwk)" height="60.8047" id="C_0000000272" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="109" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="110" y="17.1387">char</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="40" y2="40"/><ellipse cx="17" cy="51" 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="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="60.8047" y2="60.8047"/><!--MD5=[cd9f3d922c78923a8189591c1f64b871]
-class C_0000000276--><rect fill="#FEFECE" filter="url(#fzihnr85upmwk)" height="60.8047" id="C_0000000276" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="171.5" y="8"/><ellipse cx="186.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M189.4688,29.6406 Q188.8906,29.9375 188.25,30.0781 Q187.6094,30.2344 186.9063,30.2344 Q184.4063,30.2344 183.0781,28.5938 Q181.7656,26.9375 181.7656,23.8125 Q181.7656,20.6875 183.0781,19.0313 Q184.4063,17.375 186.9063,17.375 Q187.6094,17.375 188.25,17.5313 Q188.9063,17.6875 189.4688,17.9844 L189.4688,20.7031 Q188.8438,20.125 188.25,19.8594 Q187.6563,19.5781 187.0313,19.5781 Q185.6875,19.5781 185,20.6563 Q184.3125,21.7188 184.3125,23.8125 Q184.3125,25.9063 185,26.9844 Q185.6875,28.0469 187.0313,28.0469 Q187.6563,28.0469 188.25,27.7813 Q188.8438,27.5 189.4688,26.9219 L189.4688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200.5" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="91" x="274.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="89" x="275.5" y="17.1387">unsigned char</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="172.5" x2="361.5" y1="40" y2="40"/><ellipse cx="182.5" cy="51" 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.5" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="172.5" x2="361.5" y1="60.8047" y2="60.8047"/><!--MD5=[78a07e3bc5682e4c600cf853d5dda0f8]
-class C_0000000280--><rect fill="#FEFECE" filter="url(#fzihnr85upmwk)" height="60.8047" id="C_0000000280" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="398" y="8"/><ellipse cx="413" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M415.9688,29.6406 Q415.3906,29.9375 414.75,30.0781 Q414.1094,30.2344 413.4063,30.2344 Q410.9063,30.2344 409.5781,28.5938 Q408.2656,26.9375 408.2656,23.8125 Q408.2656,20.6875 409.5781,19.0313 Q410.9063,17.375 413.4063,17.375 Q414.1094,17.375 414.75,17.5313 Q415.4063,17.6875 415.9688,17.9844 L415.9688,20.7031 Q415.3438,20.125 414.75,19.8594 Q414.1563,19.5781 413.5313,19.5781 Q412.1875,19.5781 411.5,20.6563 Q410.8125,21.7188 410.8125,23.8125 Q410.8125,25.9063 411.5,26.9844 Q412.1875,28.0469 413.5313,28.0469 Q414.1563,28.0469 414.75,27.7813 Q415.3438,27.5 415.9688,26.9219 L415.9688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="427" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="501" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="502" y="17.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="515" y1="40" y2="40"/><ellipse cx="409" cy="51" 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="418" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="515" y1="60.8047" y2="60.8047"/><!--MD5=[919f4e7fb61c96910f019678b9b72bdc]
-class C_0000000284--><rect fill="#FEFECE" filter="url(#fzihnr85upmwk)" height="60.8047" id="C_0000000284" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="551.5" y="8"/><ellipse cx="566.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M569.4688,29.6406 Q568.8906,29.9375 568.25,30.0781 Q567.6094,30.2344 566.9063,30.2344 Q564.4063,30.2344 563.0781,28.5938 Q561.7656,26.9375 561.7656,23.8125 Q561.7656,20.6875 563.0781,19.0313 Q564.4063,17.375 566.9063,17.375 Q567.6094,17.375 568.25,17.5313 Q568.9063,17.6875 569.4688,17.9844 L569.4688,20.7031 Q568.8438,20.125 568.25,19.8594 Q567.6563,19.5781 567.0313,19.5781 Q565.6875,19.5781 565,20.6563 Q564.3125,21.7188 564.3125,23.8125 Q564.3125,25.9063 565,26.9844 Q565.6875,28.0469 567.0313,28.0469 Q567.6563,28.0469 568.25,27.7813 Q568.8438,27.5 569.4688,26.9219 L569.4688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580.5" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="654.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="655.5" y="17.1387">bool</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="679.5" y1="40" y2="40"/><ellipse cx="562.5" cy="51" 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.5" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="679.5" y1="60.8047" y2="60.8047"/><!--MD5=[998e808b1eaecf34705d4346e04d9b0a]
-link C_0000000272 to C_0000000270--><path d="M136.31,66.21 C180.1,84.11 237.98,107.79 284.17,126.67 " fill="none" id="C_0000000272-&gt;C_0000000270" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="286.98,120.26,302.85,134.31,281.68,133.22,286.98,120.26" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ee68bda46b1fc2b3a612f439b59c96b8]
-link C_0000000276 to C_0000000270--><path d="M290.73,69.22 C301.27,82.43 313.92,98.27 325.61,112.92 " fill="none" id="C_0000000276-&gt;C_0000000270" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="331.24,108.75,338.25,128.74,320.3,117.48,331.24,108.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b0e6a94d646e6850df0697cb2b98048d]
-link C_0000000280 to C_0000000270--><path d="M433.27,69.22 C422.73,82.43 410.08,98.27 398.39,112.92 " fill="none" id="C_0000000280-&gt;C_0000000270" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="403.7,117.48,385.75,128.74,392.76,108.75,403.7,117.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[211b3cbb929f99ab4636e276049895e8]
-link C_0000000284 to C_0000000270--><path d="M552.89,69.07 C518.61,85.13 475.93,105.13 439.62,122.13 " fill="none" id="C_0000000284-&gt;C_0000000270" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="442.38,128.57,421.3,130.72,436.44,115.9,442.38,128.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[182ccb50ba29cdcddb62a627b9dacde9]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:694px;height:200px;" version="1.1" viewBox="0 0 694 200" width="694px" zoomAndPan="magnify"><defs><filter height="300%" id="f1tygk39cd2lkk" 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></defs><g><!--MD5=[66772399e6c9a3f1b609ec8d321559aa]
+class C_0000000299--><rect fill="#FEFECE" filter="url(#f1tygk39cd2lkk)" height="60.8047" id="C_0000000299" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="303" y="129"/><ellipse cx="318" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M320.9688,150.6406 Q320.3906,150.9375 319.75,151.0781 Q319.1094,151.2344 318.4063,151.2344 Q315.9063,151.2344 314.5781,149.5938 Q313.2656,147.9375 313.2656,144.8125 Q313.2656,141.6875 314.5781,140.0313 Q315.9063,138.375 318.4063,138.375 Q319.1094,138.375 319.75,138.5313 Q320.4063,138.6875 320.9688,138.9844 L320.9688,141.7031 Q320.3438,141.125 319.75,140.8594 Q319.1563,140.5781 318.5313,140.5781 Q317.1875,140.5781 316.5,141.6563 Q315.8125,142.7188 315.8125,144.8125 Q315.8125,146.9063 316.5,147.9844 Q317.1875,149.0469 318.5313,149.0469 Q319.1563,149.0469 319.75,148.7813 Q320.3438,148.5 320.9688,147.9219 L320.9688,150.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="332" y="149.1543">is_numeric&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="304" x2="420" y1="161" y2="161"/><ellipse cx="314" cy="172" 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="323" y="175.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="304" x2="420" y1="181.8047" y2="181.8047"/><!--MD5=[cce135e7cd71e3d33d8e9f21315082fd]
+class C_0000000301--><rect fill="#FEFECE" filter="url(#f1tygk39cd2lkk)" height="60.8047" id="C_0000000301" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="109" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="110" y="17.1387">char</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="40" y2="40"/><ellipse cx="17" cy="51" 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="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="60.8047" y2="60.8047"/><!--MD5=[74f112a22dc42a19517e639a29b22f5d]
+class C_0000000305--><rect fill="#FEFECE" filter="url(#f1tygk39cd2lkk)" height="60.8047" id="C_0000000305" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="171.5" y="8"/><ellipse cx="186.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M189.4688,29.6406 Q188.8906,29.9375 188.25,30.0781 Q187.6094,30.2344 186.9063,30.2344 Q184.4063,30.2344 183.0781,28.5938 Q181.7656,26.9375 181.7656,23.8125 Q181.7656,20.6875 183.0781,19.0313 Q184.4063,17.375 186.9063,17.375 Q187.6094,17.375 188.25,17.5313 Q188.9063,17.6875 189.4688,17.9844 L189.4688,20.7031 Q188.8438,20.125 188.25,19.8594 Q187.6563,19.5781 187.0313,19.5781 Q185.6875,19.5781 185,20.6563 Q184.3125,21.7188 184.3125,23.8125 Q184.3125,25.9063 185,26.9844 Q185.6875,28.0469 187.0313,28.0469 Q187.6563,28.0469 188.25,27.7813 Q188.8438,27.5 189.4688,26.9219 L189.4688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200.5" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="91" x="274.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="89" x="275.5" y="17.1387">unsigned char</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="172.5" x2="361.5" y1="40" y2="40"/><ellipse cx="182.5" cy="51" 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.5" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="172.5" x2="361.5" y1="60.8047" y2="60.8047"/><!--MD5=[ec82ddeb34d58eaae57dfc4fabe2422b]
+class C_0000000309--><rect fill="#FEFECE" filter="url(#f1tygk39cd2lkk)" height="60.8047" id="C_0000000309" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="398" y="8"/><ellipse cx="413" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M415.9688,29.6406 Q415.3906,29.9375 414.75,30.0781 Q414.1094,30.2344 413.4063,30.2344 Q410.9063,30.2344 409.5781,28.5938 Q408.2656,26.9375 408.2656,23.8125 Q408.2656,20.6875 409.5781,19.0313 Q410.9063,17.375 413.4063,17.375 Q414.1094,17.375 414.75,17.5313 Q415.4063,17.6875 415.9688,17.9844 L415.9688,20.7031 Q415.3438,20.125 414.75,19.8594 Q414.1563,19.5781 413.5313,19.5781 Q412.1875,19.5781 411.5,20.6563 Q410.8125,21.7188 410.8125,23.8125 Q410.8125,25.9063 411.5,26.9844 Q412.1875,28.0469 413.5313,28.0469 Q414.1563,28.0469 414.75,27.7813 Q415.3438,27.5 415.9688,26.9219 L415.9688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="427" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="501" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="502" y="17.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="515" y1="40" y2="40"/><ellipse cx="409" cy="51" 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="418" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="515" y1="60.8047" y2="60.8047"/><!--MD5=[be9a7cbdf3f84acf7a57a0eb7d8e4032]
+class C_0000000313--><rect fill="#FEFECE" filter="url(#f1tygk39cd2lkk)" height="60.8047" id="C_0000000313" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="551.5" y="8"/><ellipse cx="566.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M569.4688,29.6406 Q568.8906,29.9375 568.25,30.0781 Q567.6094,30.2344 566.9063,30.2344 Q564.4063,30.2344 563.0781,28.5938 Q561.7656,26.9375 561.7656,23.8125 Q561.7656,20.6875 563.0781,19.0313 Q564.4063,17.375 566.9063,17.375 Q567.6094,17.375 568.25,17.5313 Q568.9063,17.6875 569.4688,17.9844 L569.4688,20.7031 Q568.8438,20.125 568.25,19.8594 Q567.6563,19.5781 567.0313,19.5781 Q565.6875,19.5781 565,20.6563 Q564.3125,21.7188 564.3125,23.8125 Q564.3125,25.9063 565,26.9844 Q565.6875,28.0469 567.0313,28.0469 Q567.6563,28.0469 568.25,27.7813 Q568.8438,27.5 569.4688,26.9219 L569.4688,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580.5" y="28.1543">is_numeric</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="654.5" y="5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="655.5" y="17.1387">bool</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="679.5" y1="40" y2="40"/><ellipse cx="562.5" cy="51" 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.5" y="54.2104">value : enum</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="679.5" y1="60.8047" y2="60.8047"/><!--MD5=[b388b649b6f574771087923cf627fce0]
+link C_0000000301 to C_0000000299--><path d="M136.31,66.21 C180.1,84.11 237.98,107.79 284.17,126.67 " fill="none" id="C_0000000301-&gt;C_0000000299" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="286.98,120.26,302.85,134.31,281.68,133.22,286.98,120.26" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[910cbd0bf26e4fb3534b239985cad52b]
+link C_0000000305 to C_0000000299--><path d="M290.73,69.22 C301.27,82.43 313.92,98.27 325.61,112.92 " fill="none" id="C_0000000305-&gt;C_0000000299" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="331.24,108.75,338.25,128.74,320.3,117.48,331.24,108.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3108c6b80e97461b1ffd76a9048ec775]
+link C_0000000309 to C_0000000299--><path d="M433.27,69.22 C422.73,82.43 410.08,98.27 398.39,112.92 " fill="none" id="C_0000000309-&gt;C_0000000299" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="403.7,117.48,385.75,128.74,392.76,108.75,403.7,117.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f8b41f43efb7416fcaf6508aa393715b]
+link C_0000000313 to C_0000000299--><path d="M552.89,69.07 C518.61,85.13 475.93,105.13 439.62,122.13 " fill="none" id="C_0000000313-&gt;C_0000000299" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="442.38,128.57,421.3,130.72,436.44,115.9,442.38,128.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3f4665c772dd9a2237d3e8ea407ffe89]
 @startuml
-class "is_numeric<>" as C_0000000270
-class C_0000000270 {
+
+class "is_numeric<>" as C_0000000299
+class C_0000000299 {
 +value : enum
 }
 
-class "is_numeric<char>" as C_0000000272
-class C_0000000272 {
+class "is_numeric<char>" as C_0000000301
+class C_0000000301 {
 +value : enum
 }
 
-class "is_numeric<unsigned char>" as C_0000000276
-class C_0000000276 {
+class "is_numeric<unsigned char>" as C_0000000305
+class C_0000000305 {
 +value : enum
 }
 
-class "is_numeric<int>" as C_0000000280
-class C_0000000280 {
+class "is_numeric<int>" as C_0000000309
+class C_0000000309 {
 +value : enum
 }
 
-class "is_numeric<bool>" as C_0000000284
-class C_0000000284 {
+class "is_numeric<bool>" as C_0000000313
+class C_0000000313 {
 +value : enum
 }
 
-C_0000000272 ..|> C_0000000270
-C_0000000276 ..|> C_0000000270
-C_0000000280 ..|> C_0000000270
-C_0000000284 ..|> C_0000000270
+C_0000000301 ..|> C_0000000299
+C_0000000305 ..|> C_0000000299
+C_0000000309 ..|> C_0000000299
+C_0000000313 ..|> C_0000000299
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 9729c67d..5be5275c 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,78 +1,79 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f4ehagohw7c78" 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></defs><g><!--MD5=[b8197fd92442f70c1b9037b0c8cc5bd1]
-class C_0000000288--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000288" 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"/><!--MD5=[85ca1c59f79db4301be1c2b96671d69a]
-class C_0000000290--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000290" 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"/><!--MD5=[86338ae2d68313d7363bbc2eea754a34]
-class C_0000000292--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000292" 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"/><!--MD5=[f25743dbfc9b9db45a7f7a56bbcb4c86]
-class C_0000000294--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000294" 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"/><!--MD5=[ef5f59b05c05f570e221b88f18454c23]
-class C_0000000296--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000296" 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"/><!--MD5=[c9def1b5d298d8e7e273fa3c2fcbfd30]
-class C_0000000298--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000298" 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"/><!--MD5=[816198e42984d52b0ad188477440cdb6]
-class C_0000000300--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000300" 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"/><!--MD5=[c1c2a654addc9d920bf02419a79d8c0e]
-class C_0000000302--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000302" 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"/><!--MD5=[98ee7d00ab998953490ec7876081fe59]
-class C_0000000304--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000304" 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"/><!--MD5=[3e582a412b5e37fd659ef2916e06388b]
-class C_0000000306--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000306" 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"/><!--MD5=[96b47e8beb9a91da061bb18be1cc1ba7]
-class C_0000000308--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="48" id="C_0000000308" 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"/><!--MD5=[ca4a22972c337b926c3eba4d826ad59b]
-class C_0000000310--><rect fill="#FEFECE" filter="url(#f4ehagohw7c78)" height="112.0234" id="C_0000000310" style="stroke: #A80036; stroke-width: 1.5;" width="359" x="206.5" y="8"/><ellipse cx="377.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M380.7188,29.6406 Q380.1406,29.9375 379.5,30.0781 Q378.8594,30.2344 378.1563,30.2344 Q375.6563,30.2344 374.3281,28.5938 Q373.0156,26.9375 373.0156,23.8125 Q373.0156,20.6875 374.3281,19.0313 Q375.6563,17.375 378.1563,17.375 Q378.8594,17.375 379.5,17.5313 Q380.1563,17.6875 380.7188,17.9844 L380.7188,20.7031 Q380.0938,20.125 379.5,19.8594 Q378.9063,19.5781 378.2813,19.5781 Q376.9375,19.5781 376.25,20.6563 Q375.5625,21.7188 375.5625,23.8125 Q375.5625,25.9063 376.25,26.9844 Q376.9375,28.0469 378.2813,28.0469 Q378.9063,28.0469 379.5,27.7813 Q380.0938,27.5 380.7188,26.9219 L380.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="207.5" x2="564.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="226.5" y="54.2104">some_int : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="226.5" y="67.0151">some_int_pointer : int*</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="182" x="226.5" y="79.8198">some_int_pointer_pointer : int**</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="226.5" y="92.6245">some_int_reference : int&amp;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="207.5" x2="564.5" y1="99.2188" y2="99.2188"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="107.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="333" x="226.5" y="113.4292">R(int&amp; some_int, C&amp; cc, E const&amp; ee, F&amp;&amp; ff, I*&amp; ii) : void</text><!--MD5=[7d6b0280901daa5db483863af92590b8]
-link C_0000000310 to C_0000000292--><path d="M206.45,108.78 C189.08,119.62 173.64,133.14 162,150 C153.6,162.17 156.07,178.21 161.11,191.86 " fill="none" id="C_0000000310-&gt;C_0000000292" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="163.06,196.77,163.4575,186.9292,161.2154,192.1227,156.0218,189.8806,163.06,196.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7d6b0280901daa5db483863af92590b8]
-link C_0000000310 to C_0000000292--><path d="M297.03,120.16 C282.72,129.76 268.27,139.91 255,150 C235.64,164.73 215.11,183 199.84,197.19 " fill="none" id="C_0000000310-&gt;C_0000000292-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="196.07,200.7,205.385,197.5015,199.7319,197.2956,199.9379,191.6424,196.07,200.7" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="256" y="163.0669">-c</text><!--MD5=[aebe9476aa1d1f7c7e1ef1df0f2538ef]
-link C_0000000310 to C_0000000296--><path d="M328.46,120.3 C321.75,129.55 315.91,139.56 312,150 C306.98,163.4 309.68,178.85 314.18,191.83 " fill="none" id="C_0000000310-&gt;C_0000000296" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="316.06,196.85,316.6452,187.0185,314.3044,192.1684,309.1546,189.8275,316.06,196.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[aebe9476aa1d1f7c7e1ef1df0f2538ef]
-link C_0000000310 to C_0000000296--><path d="M365.39,120.08 C356.32,144.31 346.06,171.73 338.59,191.71 " fill="none" id="C_0000000310-&gt;C_0000000296-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="336.75,196.62,343.6366,189.5791,338.4931,191.9337,336.1385,186.7901,336.75,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="355" y="163.0669">-e</text><!--MD5=[cd54a8f16b662e6703829c6c1c604144]
-link C_0000000310 to C_0000000298--><path d="M392.04,120.08 C394.69,144.21 397.68,171.5 399.87,191.46 " fill="none" id="C_0000000310-&gt;C_0000000298" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="400.44,196.62,403.4128,187.2305,399.8831,191.6511,395.4625,188.1215,400.44,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[838384892191374ac2f16eecefa7fa3e]
-reverse link C_0000000310 to C_0000000298--><path d="M402.61,133.18 C403.57,138.85 404.39,144.5 405,150 C405.83,157.51 405.14,159.45 405,167 C404.82,176.76 404.44,187.52 404.07,196.79 " fill="none" id="C_0000000310&lt;-C_0000000298" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="400.15,120.03,397.3198,126.6625,402.3535,131.826,405.1837,125.1935,400.15,120.03" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="9" x="407" y="163.0669">-f</text><!--MD5=[d9daa3abaaba4e4ffb21efadb60188ca]
-link C_0000000310 to C_0000000304--><path d="M472.34,120.01 C509.26,143.62 552.81,171.57 592,197 C596.21,199.73 600.69,202.66 604.99,205.48 " fill="none" id="C_0000000310-&gt;C_0000000304" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="609.22,208.26,603.8846,199.9815,605.0379,205.5195,599.4999,206.6728,609.22,208.26" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d9daa3abaaba4e4ffb21efadb60188ca]
-link C_0000000310 to C_0000000304--><path d="M511.39,120.16 C527.93,129.27 544.24,139.28 559,150 C576.42,162.65 593.29,179.99 605.88,194.24 " fill="none" id="C_0000000310-&gt;C_0000000304-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="609.31,198.17,606.414,188.7565,606.0256,194.4,600.3821,194.0116,609.31,198.17" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="579" y="163.0669">-i</text><!--MD5=[ea159f4bac2645c433c7fefdf41952c7]
-reverse link C_0000000310 to C_0000000288--><path d="M193.72,107.57 C160.62,118.83 127.43,132.79 98,150 C77.23,162.14 57.93,181.54 44.55,196.83 " fill="none" id="C_0000000310&lt;-C_0000000288" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="206.4,103.39,199.449,101.4709,195.004,107.1491,201.955,109.0682,206.4,103.39" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="99" y="163.0669">-a</text><!--MD5=[54b8d2457bef6851d01a58ae15b620c3]
-link C_0000000310 to C_0000000290--><path d="M206.39,105.35 C180.14,116.75 154.94,131.34 134,150 C121.56,161.08 113.43,177.85 108.35,192.19 " fill="none" id="C_0000000310-&gt;C_0000000290" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="106.75,196.95,113.4236,189.7069,108.3526,192.2138,105.8457,187.1427,106.75,196.95" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="135" y="163.0669">-b</text><!--MD5=[6ac07c3f7477ec992c1ad3e58180e3a0]
-link C_0000000310 to C_0000000294--><path d="M314.7,120.06 C304.75,129.44 295.15,139.55 287,150 C277.1,162.69 268.87,178.62 262.88,192.08 " fill="none" id="C_0000000310-&gt;C_0000000294" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="260.78,196.92,268.0444,190.2695,262.7788,192.3369,260.7115,187.0714,260.78,196.92" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="288" y="163.0669">-d</text><!--MD5=[af060ff32719b25c6f5fa7da037181c0]
-link C_0000000310 to C_0000000300--><path d="M418.69,120.08 C433.2,144.51 449.63,172.2 461.51,192.22 " fill="none" id="C_0000000310-&gt;C_0000000300" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="464.13,196.62,462.9678,186.84,461.5743,192.3225,456.0918,190.929,464.13,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="447" y="163.0669">-g</text><!--MD5=[89f550a36ac102715f3dc4a4675dd2f0]
-link C_0000000310 to C_0000000302--><path d="M445.7,120.08 C474.59,146.73 507.67,177.26 529.59,197.48 " fill="none" id="C_0000000310-&gt;C_0000000302" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="533.28,200.88,529.3755,191.8382,529.6043,197.4904,523.9521,197.7192,533.28,200.88" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="496" y="163.0669">-h</text><!--MD5=[abac71c5e51c0f4921d95f3ebd74b9f4]
-link C_0000000310 to C_0000000306--><path d="M533.93,120.04 C555.11,129.31 576.36,139.39 596,150 C624.74,165.53 655.23,187.52 675.1,202.69 " fill="none" id="C_0000000310-&gt;C_0000000306" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="679.17,205.82,674.4737,197.1629,675.2063,202.7721,669.5971,203.5048,679.17,205.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="624" y="163.0669">-j</text><!--MD5=[703be00a292ee1c59391108c51f4314c]
-link C_0000000310 to C_0000000308--><path d="M562.91,120.01 C589.34,129.36 616.06,139.48 641,150 C682.94,167.69 692.42,174.52 732,197 C736.15,199.36 740.51,201.95 744.72,204.52 " fill="none" id="C_0000000310-&gt;C_0000000308" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="749.2,207.29,743.6436,199.1582,744.9456,204.6631,739.4407,205.9652,749.2,207.29" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="680" y="163.0669">-k</text><!--MD5=[309336686fb15ff120520d817bda710e]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f10oyx3o9x3icy" 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></defs><g><!--MD5=[a8bd19947aa89058287f9cc196c240f8]
+class C_0000000319--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000319" 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"/><!--MD5=[55d1da105a024b2817112188f374748b]
+class C_0000000321--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000321" 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"/><!--MD5=[4b7d4f1de8c1a7004b7285fc4e3bfe11]
+class C_0000000323--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000323" 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"/><!--MD5=[1d5e81fc19c90796fcbec721e35140dc]
+class C_0000000325--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000325" 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"/><!--MD5=[c9c36f98f274968600c976bd7b40e6b4]
+class C_0000000327--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000327" 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"/><!--MD5=[79fb9d02297347999fbbe0cf90c26655]
+class C_0000000329--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000329" 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"/><!--MD5=[99df25cfd295dd29ef3af08f98ad6218]
+class C_0000000331--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000331" 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"/><!--MD5=[1ae409f3cb9d9ef52d64f5650312a843]
+class C_0000000333--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000333" 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"/><!--MD5=[85b273a442fdcaa14e3b08baf6db4766]
+class C_0000000335--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000335" 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"/><!--MD5=[874a98e82068d9cc1227697d20d0fea4]
+class C_0000000337--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000337" 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"/><!--MD5=[d229082899d8176eed2f7b38e02f42fd]
+class C_0000000339--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="48" id="C_0000000339" 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"/><!--MD5=[2d5accd6242763c7ac1c4c3010abb2d1]
+class C_0000000341--><rect fill="#FEFECE" filter="url(#f10oyx3o9x3icy)" height="112.0234" id="C_0000000341" style="stroke: #A80036; stroke-width: 1.5;" width="359" x="206.5" y="8"/><ellipse cx="377.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M380.7188,29.6406 Q380.1406,29.9375 379.5,30.0781 Q378.8594,30.2344 378.1563,30.2344 Q375.6563,30.2344 374.3281,28.5938 Q373.0156,26.9375 373.0156,23.8125 Q373.0156,20.6875 374.3281,19.0313 Q375.6563,17.375 378.1563,17.375 Q378.8594,17.375 379.5,17.5313 Q380.1563,17.6875 380.7188,17.9844 L380.7188,20.7031 Q380.0938,20.125 379.5,19.8594 Q378.9063,19.5781 378.2813,19.5781 Q376.9375,19.5781 376.25,20.6563 Q375.5625,21.7188 375.5625,23.8125 Q375.5625,25.9063 376.25,26.9844 Q376.9375,28.0469 378.2813,28.0469 Q378.9063,28.0469 379.5,27.7813 Q380.0938,27.5 380.7188,26.9219 L380.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="207.5" x2="564.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="226.5" y="54.2104">some_int : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="60.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="226.5" y="67.0151">some_int_pointer : int*</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="73.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="182" x="226.5" y="79.8198">some_int_pointer_pointer : int**</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="86.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="226.5" y="92.6245">some_int_reference : int&amp;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="207.5" x2="564.5" y1="99.2188" y2="99.2188"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="214.5" y="107.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="333" x="226.5" y="113.4292">R(int&amp; some_int, C&amp; cc, E const&amp; ee, F&amp;&amp; ff, I*&amp; ii) : void</text><!--MD5=[7d83a9214b4d7b006036deaa8a16e0d3]
+link C_0000000341 to C_0000000323--><path d="M206.45,108.78 C189.08,119.62 173.64,133.14 162,150 C153.6,162.17 156.07,178.21 161.11,191.86 " fill="none" id="C_0000000341-&gt;C_0000000323" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="163.06,196.77,163.4575,186.9292,161.2154,192.1227,156.0218,189.8806,163.06,196.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7d83a9214b4d7b006036deaa8a16e0d3]
+link C_0000000341 to C_0000000323--><path d="M297.03,120.16 C282.72,129.76 268.27,139.91 255,150 C235.64,164.73 215.11,183 199.84,197.19 " fill="none" id="C_0000000341-&gt;C_0000000323-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="196.07,200.7,205.385,197.5015,199.7319,197.2956,199.9379,191.6424,196.07,200.7" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="256" y="163.0669">-c</text><!--MD5=[036d51ceae39da3ac059e083950a7458]
+link C_0000000341 to C_0000000327--><path d="M328.46,120.3 C321.75,129.55 315.91,139.56 312,150 C306.98,163.4 309.68,178.85 314.18,191.83 " fill="none" id="C_0000000341-&gt;C_0000000327" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="316.06,196.85,316.6452,187.0185,314.3044,192.1684,309.1546,189.8275,316.06,196.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[036d51ceae39da3ac059e083950a7458]
+link C_0000000341 to C_0000000327--><path d="M365.39,120.08 C356.32,144.31 346.06,171.73 338.59,191.71 " fill="none" id="C_0000000341-&gt;C_0000000327-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="336.75,196.62,343.6366,189.5791,338.4931,191.9337,336.1385,186.7901,336.75,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="355" y="163.0669">-e</text><!--MD5=[eb05d832d49b0fb58b57b43243bdf7bc]
+link C_0000000341 to C_0000000329--><path d="M392.04,120.08 C394.69,144.21 397.68,171.5 399.87,191.46 " fill="none" id="C_0000000341-&gt;C_0000000329" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="400.44,196.62,403.4128,187.2305,399.8831,191.6511,395.4625,188.1215,400.44,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bd3d4f191d06d94a052e55b5d9359512]
+reverse link C_0000000341 to C_0000000329--><path d="M402.61,133.18 C403.57,138.85 404.39,144.5 405,150 C405.83,157.51 405.14,159.45 405,167 C404.82,176.76 404.44,187.52 404.07,196.79 " fill="none" id="C_0000000341&lt;-C_0000000329" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="400.15,120.03,397.3198,126.6625,402.3535,131.826,405.1837,125.1935,400.15,120.03" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="9" x="407" y="163.0669">-f</text><!--MD5=[19a5715b818a2ec424bfa6fb4eead6bf]
+link C_0000000341 to C_0000000335--><path d="M472.34,120.01 C509.26,143.62 552.81,171.57 592,197 C596.21,199.73 600.69,202.66 604.99,205.48 " fill="none" id="C_0000000341-&gt;C_0000000335" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="609.22,208.26,603.8846,199.9815,605.0379,205.5195,599.4999,206.6728,609.22,208.26" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[19a5715b818a2ec424bfa6fb4eead6bf]
+link C_0000000341 to C_0000000335--><path d="M511.39,120.16 C527.93,129.27 544.24,139.28 559,150 C576.42,162.65 593.29,179.99 605.88,194.24 " fill="none" id="C_0000000341-&gt;C_0000000335-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="609.31,198.17,606.414,188.7565,606.0256,194.4,600.3821,194.0116,609.31,198.17" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="579" y="163.0669">-i</text><!--MD5=[fcc334ec69e5486266d90f1a3595fcbb]
+reverse link C_0000000341 to C_0000000319--><path d="M193.72,107.57 C160.62,118.83 127.43,132.79 98,150 C77.23,162.14 57.93,181.54 44.55,196.83 " fill="none" id="C_0000000341&lt;-C_0000000319" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="206.4,103.39,199.449,101.4709,195.004,107.1491,201.955,109.0682,206.4,103.39" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="99" y="163.0669">-a</text><!--MD5=[63a90da3da38c83f847d04039d38a6f7]
+link C_0000000341 to C_0000000321--><path d="M206.39,105.35 C180.14,116.75 154.94,131.34 134,150 C121.56,161.08 113.43,177.85 108.35,192.19 " fill="none" id="C_0000000341-&gt;C_0000000321" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="106.75,196.95,113.4236,189.7069,108.3526,192.2138,105.8457,187.1427,106.75,196.95" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="135" y="163.0669">-b</text><!--MD5=[6a31e83923644cc87a2c72b561a4c687]
+link C_0000000341 to C_0000000325--><path d="M314.7,120.06 C304.75,129.44 295.15,139.55 287,150 C277.1,162.69 268.87,178.62 262.88,192.08 " fill="none" id="C_0000000341-&gt;C_0000000325" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="260.78,196.92,268.0444,190.2695,262.7788,192.3369,260.7115,187.0714,260.78,196.92" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="288" y="163.0669">-d</text><!--MD5=[e4530add88161dd1b9669717f52f906b]
+link C_0000000341 to C_0000000331--><path d="M418.69,120.08 C433.2,144.51 449.63,172.2 461.51,192.22 " fill="none" id="C_0000000341-&gt;C_0000000331" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="464.13,196.62,462.9678,186.84,461.5743,192.3225,456.0918,190.929,464.13,196.62" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="447" y="163.0669">-g</text><!--MD5=[8927190ebf63122275a75a9146f2f5a7]
+link C_0000000341 to C_0000000333--><path d="M445.7,120.08 C474.59,146.73 507.67,177.26 529.59,197.48 " fill="none" id="C_0000000341-&gt;C_0000000333" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="533.28,200.88,529.3755,191.8382,529.6043,197.4904,523.9521,197.7192,533.28,200.88" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="496" y="163.0669">-h</text><!--MD5=[d7c1776516223f8efa2a29034aa3a0ca]
+link C_0000000341 to C_0000000337--><path d="M533.93,120.04 C555.11,129.31 576.36,139.39 596,150 C624.74,165.53 655.23,187.52 675.1,202.69 " fill="none" id="C_0000000341-&gt;C_0000000337" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="679.17,205.82,674.4737,197.1629,675.2063,202.7721,669.5971,203.5048,679.17,205.82" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="624" y="163.0669">-j</text><!--MD5=[a87e63c7682b19ca32f94519752a793b]
+link C_0000000341 to C_0000000339--><path d="M562.91,120.01 C589.34,129.36 616.06,139.48 641,150 C682.94,167.69 692.42,174.52 732,197 C736.15,199.36 740.51,201.95 744.72,204.52 " fill="none" id="C_0000000341-&gt;C_0000000339" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="749.2,207.29,743.6436,199.1582,744.9456,204.6631,739.4407,205.9652,749.2,207.29" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="680" y="163.0669">-k</text><!--MD5=[2015a8027ccd12f50c97ff3903841391]
 @startuml
-class "A" as C_0000000288
-class C_0000000288 {
+
+class "A" as C_0000000319
+class C_0000000319 {
 }
 
-class "B" as C_0000000290
-class C_0000000290 {
+class "B" as C_0000000321
+class C_0000000321 {
 }
 
-class "C" as C_0000000292
-class C_0000000292 {
+class "C" as C_0000000323
+class C_0000000323 {
 }
 
-class "D" as C_0000000294
-class C_0000000294 {
+class "D" as C_0000000325
+class C_0000000325 {
 }
 
-class "E" as C_0000000296
-class C_0000000296 {
+class "E" as C_0000000327
+class C_0000000327 {
 }
 
-class "F" as C_0000000298
-class C_0000000298 {
+class "F" as C_0000000329
+class C_0000000329 {
 }
 
-class "G" as C_0000000300
-class C_0000000300 {
+class "G" as C_0000000331
+class C_0000000331 {
 }
 
-class "H" as C_0000000302
-class C_0000000302 {
+class "H" as C_0000000333
+class C_0000000333 {
 }
 
-class "I" as C_0000000304
-class C_0000000304 {
+class "I" as C_0000000335
+class C_0000000335 {
 }
 
-class "J" as C_0000000306
-class C_0000000306 {
+class "J" as C_0000000337
+class C_0000000337 {
 }
 
-class "K" as C_0000000308
-class C_0000000308 {
+class "K" as C_0000000339
+class C_0000000339 {
 }
 
-class "R" as C_0000000310
-class C_0000000310 {
+class "R" as C_0000000341
+class C_0000000341 {
 {static} -R(int& some_int, C& cc, E const& ee, F&& ff, I*& ii) : void
 -some_int : int
 -some_int_pointer : int*
@@ -80,21 +81,21 @@ class C_0000000310 {
 -some_int_reference : int&
 }
 
-C_0000000310 ..> C_0000000292
-C_0000000310 ..> C_0000000296
-C_0000000310 ..> C_0000000298
-C_0000000310 ..> C_0000000304
-C_0000000310 o- - C_0000000288 : -a
-C_0000000310 - -> C_0000000290 : -b
-C_0000000310 - -> C_0000000292 : -c
-C_0000000310 - -> C_0000000294 : -d
-C_0000000310 - -> C_0000000296 : -e
-C_0000000310 o- - C_0000000298 : -f
-C_0000000310 - -> C_0000000300 : -g
-C_0000000310 - -> C_0000000302 : -h
-C_0000000310 - -> C_0000000304 : -i
-C_0000000310 - -> C_0000000306 : -j
-C_0000000310 - -> C_0000000308 : -k
+C_0000000341 ..> C_0000000323
+C_0000000341 ..> C_0000000327
+C_0000000341 ..> C_0000000329
+C_0000000341 ..> C_0000000335
+C_0000000341 o- - C_0000000319 : -a
+C_0000000341 - -> C_0000000321 : -b
+C_0000000341 - -> C_0000000323 : -c
+C_0000000341 - -> C_0000000325 : -d
+C_0000000341 - -> C_0000000327 : -e
+C_0000000341 o- - C_0000000329 : -f
+C_0000000341 - -> C_0000000331 : -g
+C_0000000341 - -> C_0000000333 : -h
+C_0000000341 - -> C_0000000335 : -i
+C_0000000341 - -> C_0000000337 : -j
+C_0000000341 - -> C_0000000339 : -k
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index 72c77c4f..76cdd262 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="371px" preserveAspectRatio="none" style="width:259px;height:371px;" version="1.1" viewBox="0 0 259 371" width="259px" zoomAndPan="magnify"><defs><filter height="300%" id="fuvi4p6uph63i" 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></defs><g><!--MD5=[be9a7cbdf3f84acf7a57a0eb7d8e4032]
-class C_0000000313--><rect fill="#FEFECE" filter="url(#fuvi4p6uph63i)" height="99.2188" id="C_0000000313" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="13.5" y="8"/><ellipse cx="85.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M88.7188,29.6406 Q88.1406,29.9375 87.5,30.0781 Q86.8594,30.2344 86.1563,30.2344 Q83.6563,30.2344 82.3281,28.5938 Q81.0156,26.9375 81.0156,23.8125 Q81.0156,20.6875 82.3281,19.0313 Q83.6563,17.375 86.1563,17.375 Q86.8594,17.375 87.5,17.5313 Q88.1563,17.6875 88.7188,17.9844 L88.7188,20.7031 Q88.0938,20.125 87.5,19.8594 Q86.9063,19.5781 86.2813,19.5781 Q84.9375,19.5781 84.25,20.6563 Q83.5625,21.7188 83.5625,23.8125 Q83.5625,25.9063 84.25,26.9844 Q84.9375,28.0469 86.2813,28.0469 Q86.9063,28.0469 87.5,27.7813 Q88.0938,27.5 88.7188,26.9219 L88.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="106.25" y="28.1543">impl::widget</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="14.5" x2="239.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="21.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="33.5" y="54.2104">n : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="14.5" x2="239.5" y1="60.8047" y2="60.8047"/><ellipse cx="24.5" cy="71.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="201" x="33.5" y="75.0151">draw(widget const&amp; w) const : void</text><ellipse cx="24.5" cy="84.6094" 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="166" x="33.5" y="87.8198">draw(widget const&amp; w) : void</text><ellipse cx="24.5" cy="97.4141" 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" text-decoration="underline" textLength="105" x="33.5" y="100.6245">widget(int n) : void</text><!--MD5=[25cf63d666f3364b0c6905615f177bde]
-class C_0000000316--><rect fill="#FEFECE" filter="url(#fuvi4p6uph63i)" height="176.0469" id="C_0000000316" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="6" y="184"/><ellipse cx="102.25" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M105.2188,205.6406 Q104.6406,205.9375 104,206.0781 Q103.3594,206.2344 102.6563,206.2344 Q100.1563,206.2344 98.8281,204.5938 Q97.5156,202.9375 97.5156,199.8125 Q97.5156,196.6875 98.8281,195.0313 Q100.1563,193.375 102.6563,193.375 Q103.3594,193.375 104,193.5313 Q104.6563,193.6875 105.2188,193.9844 L105.2188,196.7031 Q104.5938,196.125 104,195.8594 Q103.4063,195.5781 102.7813,195.5781 Q101.4375,195.5781 100.75,196.6563 Q100.0625,197.7188 100.0625,199.8125 Q100.0625,201.9063 100.75,202.9844 Q101.4375,204.0469 102.7813,204.0469 Q103.4063,204.0469 104,203.7813 Q104.5938,203.5 105.2188,202.9219 L105.2188,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="122.75" y="204.1543">widget</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="247" y1="216" y2="216"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="224"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="230.2104">pImpl : std::unique_ptr&lt;impl::widget&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="247" y1="236.8047" y2="236.8047"/><ellipse cx="17" cy="247.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="106" x="26" y="251.0151">draw() const : void</text><ellipse cx="17" cy="260.6094" 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="71" x="26" y="263.8198">draw() : void</text><ellipse cx="17" cy="273.4141" 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="116" x="26" y="276.6245">shown() const : bool</text><ellipse cx="17" cy="286.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" text-decoration="underline" textLength="98" x="26" y="289.4292">widget(int ) : void</text><ellipse cx="17" cy="299.0234" 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" text-decoration="underline" textLength="89" x="26" y="302.2339">~widget() : void</text><ellipse cx="17" cy="311.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" text-decoration="underline" textLength="141" x="26" y="315.0386">widget(widget&amp;&amp; ) : void</text><ellipse cx="17" cy="324.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" text-decoration="underline" textLength="166" x="26" y="327.8433">widget(widget const&amp; ) : void</text><ellipse cx="17" cy="337.4375" 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="340.6479">operator=(widget&amp;&amp; ) : widget&amp;</text><ellipse cx="17" cy="350.2422" 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="211" x="26" y="353.4526">operator=(widget const&amp; ) : widget&amp;</text><!--MD5=[32b3799fdcf61d3002ffd47d08fd6e1f]
-link C_0000000313 to C_0000000316--><path d="M121.99,107.03 C121.16,116.94 120.43,127.29 120,137 C119.4,150.47 119.43,164.7 119.83,178.66 " fill="none" id="C_0000000313-&gt;C_0000000316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="120,183.79,123.7153,174.6688,119.8429,178.7925,115.7193,174.9201,120,183.79" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ba91839737514fc851be200590c94bd6]
-reverse link C_0000000316 to C_0000000313--><path d="M127,170.43 C127,148.43 127,126.11 127,107.25 " fill="none" id="C_0000000316&lt;-C_0000000313" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="127,183.68,131,177.68,127,171.68,123,177.68,127,183.68" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="130" y="143.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="140" y="150.0669">pImpl</text><!--MD5=[7eeb2f7f9d880bda0cabbd8b4f7f7293]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="371px" preserveAspectRatio="none" style="width:259px;height:371px;" version="1.1" viewBox="0 0 259 371" width="259px" zoomAndPan="magnify"><defs><filter height="300%" id="f1jhk20t90zn1b" 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></defs><g><!--MD5=[404d7982bdf7b48b1194f18f06f7bc11]
+class C_0000000346--><rect fill="#FEFECE" filter="url(#f1jhk20t90zn1b)" height="99.2188" id="C_0000000346" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="13.5" y="8"/><ellipse cx="85.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M88.7188,29.6406 Q88.1406,29.9375 87.5,30.0781 Q86.8594,30.2344 86.1563,30.2344 Q83.6563,30.2344 82.3281,28.5938 Q81.0156,26.9375 81.0156,23.8125 Q81.0156,20.6875 82.3281,19.0313 Q83.6563,17.375 86.1563,17.375 Q86.8594,17.375 87.5,17.5313 Q88.1563,17.6875 88.7188,17.9844 L88.7188,20.7031 Q88.0938,20.125 87.5,19.8594 Q86.9063,19.5781 86.2813,19.5781 Q84.9375,19.5781 84.25,20.6563 Q83.5625,21.7188 83.5625,23.8125 Q83.5625,25.9063 84.25,26.9844 Q84.9375,28.0469 86.2813,28.0469 Q86.9063,28.0469 87.5,27.7813 Q88.0938,27.5 88.7188,26.9219 L88.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="106.25" y="28.1543">impl::widget</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="14.5" x2="239.5" y1="40" y2="40"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="21.5" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="33.5" y="54.2104">n : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="14.5" x2="239.5" y1="60.8047" y2="60.8047"/><ellipse cx="24.5" cy="71.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="201" x="33.5" y="75.0151">draw(widget const&amp; w) const : void</text><ellipse cx="24.5" cy="84.6094" 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="166" x="33.5" y="87.8198">draw(widget const&amp; w) : void</text><ellipse cx="24.5" cy="97.4141" 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" text-decoration="underline" textLength="105" x="33.5" y="100.6245">widget(int n) : void</text><!--MD5=[be1a93fdb3e0d54a8e213ac3a10ef939]
+class C_0000000351--><rect fill="#FEFECE" filter="url(#f1jhk20t90zn1b)" height="176.0469" id="C_0000000351" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="6" y="184"/><ellipse cx="102.25" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M105.2188,205.6406 Q104.6406,205.9375 104,206.0781 Q103.3594,206.2344 102.6563,206.2344 Q100.1563,206.2344 98.8281,204.5938 Q97.5156,202.9375 97.5156,199.8125 Q97.5156,196.6875 98.8281,195.0313 Q100.1563,193.375 102.6563,193.375 Q103.3594,193.375 104,193.5313 Q104.6563,193.6875 105.2188,193.9844 L105.2188,196.7031 Q104.5938,196.125 104,195.8594 Q103.4063,195.5781 102.7813,195.5781 Q101.4375,195.5781 100.75,196.6563 Q100.0625,197.7188 100.0625,199.8125 Q100.0625,201.9063 100.75,202.9844 Q101.4375,204.0469 102.7813,204.0469 Q103.4063,204.0469 104,203.7813 Q104.5938,203.5 105.2188,202.9219 L105.2188,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="122.75" y="204.1543">widget</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="247" y1="216" y2="216"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="224"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="230.2104">pImpl : std::unique_ptr&lt;impl::widget&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="247" y1="236.8047" y2="236.8047"/><ellipse cx="17" cy="247.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="106" x="26" y="251.0151">draw() const : void</text><ellipse cx="17" cy="260.6094" 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="71" x="26" y="263.8198">draw() : void</text><ellipse cx="17" cy="273.4141" 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="116" x="26" y="276.6245">shown() const : bool</text><ellipse cx="17" cy="286.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" text-decoration="underline" textLength="98" x="26" y="289.4292">widget(int ) : void</text><ellipse cx="17" cy="299.0234" 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" text-decoration="underline" textLength="89" x="26" y="302.2339">~widget() : void</text><ellipse cx="17" cy="311.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" text-decoration="underline" textLength="141" x="26" y="315.0386">widget(widget&amp;&amp; ) : void</text><ellipse cx="17" cy="324.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" text-decoration="underline" textLength="166" x="26" y="327.8433">widget(widget const&amp; ) : void</text><ellipse cx="17" cy="337.4375" 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="340.6479">operator=(widget&amp;&amp; ) : widget&amp;</text><ellipse cx="17" cy="350.2422" 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="211" x="26" y="353.4526">operator=(widget const&amp; ) : widget&amp;</text><!--MD5=[5c74e152e2bdeb6b789c106314308f5a]
+link C_0000000346 to C_0000000351--><path d="M121.99,107.03 C121.16,116.94 120.43,127.29 120,137 C119.4,150.47 119.43,164.7 119.83,178.66 " fill="none" id="C_0000000346-&gt;C_0000000351" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="120,183.79,123.7153,174.6688,119.8429,178.7925,115.7193,174.9201,120,183.79" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4bf4d6a6ead67d2d7f8a238a9e6a0e48]
+reverse link C_0000000351 to C_0000000346--><path d="M127,170.43 C127,148.43 127,126.11 127,107.25 " fill="none" id="C_0000000351&lt;-C_0000000346" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="127,183.68,131,177.68,127,171.68,123,177.68,127,183.68" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="130" y="143.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="140" y="150.0669">pImpl</text><!--MD5=[b294ac3c2f7572c04ceedbfbf9990f99]
 @startuml
-class "impl::widget" as C_0000000313
-class C_0000000313 {
+
+class "impl::widget" as C_0000000346
+class C_0000000346 {
 +draw(widget const& w) const : void
 +draw(widget const& w) : void
 {static} +widget(int n) : void
 -n : int
 }
 
-class "widget" as C_0000000316
-class C_0000000316 {
+class "widget" as C_0000000351
+class C_0000000351 {
 +draw() const : void
 +draw() : void
 +shown() const : bool
@@ -26,8 +27,8 @@ class C_0000000316 {
 -pImpl : std::unique_ptr<impl::widget>
 }
 
-C_0000000313 ..> C_0000000316
-C_0000000316 o- - C_0000000313 : -pImpl
+C_0000000346 ..> C_0000000351
+C_0000000351 o- - C_0000000346 : -pImpl
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index df7cc06e..11452e5d 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,44 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:714px;height:403px;" version="1.1" viewBox="0 0 714 403" width="714px" zoomAndPan="magnify"><defs><filter height="300%" id="f1nf4t5xg3jzz4" 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></defs><g><!--MD5=[55d1da105a024b2817112188f374748b]
-class C_0000000321--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="60.8047" id="C_0000000321" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="156" y="146"/><ellipse cx="183.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M186.1188,167.6406 Q185.5406,167.9375 184.9,168.0781 Q184.2594,168.2344 183.5563,168.2344 Q181.0563,168.2344 179.7281,166.5938 Q178.4156,164.9375 178.4156,161.8125 Q178.4156,158.6875 179.7281,157.0313 Q181.0563,155.375 183.5563,155.375 Q184.2594,155.375 184.9,155.5313 Q185.5563,155.6875 186.1188,155.9844 L186.1188,158.7031 Q185.4938,158.125 184.9,157.8594 Q184.3063,157.5781 183.6813,157.5781 Q182.3375,157.5781 181.65,158.6563 Q180.9625,159.7188 180.9625,161.8125 Q180.9625,163.9063 181.65,164.9844 Q182.3375,166.0469 183.6813,166.0469 Q184.3063,166.0469 184.9,165.7813 Q185.4938,165.5 186.1188,164.9219 L186.1188,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="199.85" y="166.1543">Layer2</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="261" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="262" y="155.1387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="332" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="332" y1="186" y2="186"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="164" y="194"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="176" y="200.2104">all_calls_count() const : int</text><!--MD5=[4b7d4f1de8c1a7004b7285fc4e3bfe11]
-class C_0000000323--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="99.2188" id="C_0000000323" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="281"/><ellipse cx="48" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M50.9688,302.6406 Q50.3906,302.9375 49.75,303.0781 Q49.1094,303.2344 48.4063,303.2344 Q45.9063,303.2344 44.5781,301.5938 Q43.2656,299.9375 43.2656,296.8125 Q43.2656,293.6875 44.5781,292.0313 Q45.9063,290.375 48.4063,290.375 Q49.1094,290.375 49.75,290.5313 Q50.4063,290.6875 50.9688,290.9844 L50.9688,293.7031 Q50.3438,293.125 49.75,292.8594 Q49.1563,292.5781 48.5313,292.5781 Q47.1875,292.5781 46.5,293.6563 Q45.8125,294.7188 45.8125,296.8125 Q45.8125,298.9063 46.5,299.9844 Q47.1875,301.0469 48.5313,301.0469 Q49.1563,301.0469 49.75,300.7813 Q50.3438,300.5 50.9688,299.9219 L50.9688,302.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="68" y="301.1543">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="313" y2="313"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="321" y2="321"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="329"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="72" x="26" y="335.2104">Base() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="341.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="81" x="26" y="348.0151">~Base() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="354.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="360.8198">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="367.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="373.6245">m2() : std::string</text><!--MD5=[1d5e81fc19c90796fcbec721e35140dc]
-class C_0000000325--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="73.6094" id="C_0000000325" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="409.5" y="293.5"/><ellipse cx="424.5" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M427.4688,315.1406 Q426.8906,315.4375 426.25,315.5781 Q425.6094,315.7344 424.9063,315.7344 Q422.4063,315.7344 421.0781,314.0938 Q419.7656,312.4375 419.7656,309.3125 Q419.7656,306.1875 421.0781,304.5313 Q422.4063,302.875 424.9063,302.875 Q425.6094,302.875 426.25,303.0313 Q426.9063,303.1875 427.4688,303.4844 L427.4688,306.2031 Q426.8438,305.625 426.25,305.3594 Q425.6563,305.0781 425.0313,305.0781 Q423.6875,305.0781 423,306.1563 Q422.3125,307.2188 422.3125,309.3125 Q422.3125,311.4063 423,312.4844 Q423.6875,313.5469 425.0313,313.5469 Q425.6563,313.5469 426.25,313.2813 Q426.8438,313 427.4688,312.4219 L427.4688,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="438.5" y="313.6543">Layer1</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="487.5" y="290.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="488.5" y="302.6387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="410.5" x2="558.5" y1="325.5" y2="325.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="410.5" x2="558.5" y1="333.5" y2="333.5"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="417.5" y="341.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="429.5" y="347.7104">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="417.5" y="354.3047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="429.5" y="360.5151">m2() : std::string</text><!--MD5=[c9c36f98f274968600c976bd7b40e6b4]
-class C_0000000327--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="124.8281" id="C_0000000327" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="164.5" y="268"/><ellipse cx="179.5" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M182.4688,289.6406 Q181.8906,289.9375 181.25,290.0781 Q180.6094,290.2344 179.9063,290.2344 Q177.4063,290.2344 176.0781,288.5938 Q174.7656,286.9375 174.7656,283.8125 Q174.7656,280.6875 176.0781,279.0313 Q177.4063,277.375 179.9063,277.375 Q180.6094,277.375 181.25,277.5313 Q181.9063,277.6875 182.4688,277.9844 L182.4688,280.7031 Q181.8438,280.125 181.25,279.8594 Q180.6563,279.5781 180.0313,279.5781 Q178.6875,279.5781 178,280.6563 Q177.3125,281.7188 177.3125,283.8125 Q177.3125,285.9063 178,286.9844 Q178.6875,288.0469 180.0313,288.0469 Q180.6563,288.0469 181.25,287.7813 Q181.8438,287.5 182.4688,286.9219 L182.4688,289.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="193.5" y="288.1543">Layer3</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="242.5" y="265"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="243.5" y="277.1387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165.5" x2="313.5" y1="300" y2="300"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="184.5" y="314.2104">m_m1_calls : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="320.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="184.5" y="327.0151">m_m2_calls : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165.5" x2="313.5" y1="333.6094" y2="333.6094"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="341.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="184.5" y="347.8198">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="354.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184.5" y="360.6245">m2() : std::string</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="367.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="184.5" y="373.4292">m1_calls() const : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="380.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="184.5" y="386.2339">m2_calls() const : int</text><!--MD5=[1ae409f3cb9d9ef52d64f5650312a843]
-class C_0000000333--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="48" id="C_0000000333" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="14" y="152.5"/><ellipse cx="29" cy="168.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M31.9688,174.1406 Q31.3906,174.4375 30.75,174.5781 Q30.1094,174.7344 29.4063,174.7344 Q26.9063,174.7344 25.5781,173.0938 Q24.2656,171.4375 24.2656,168.3125 Q24.2656,165.1875 25.5781,163.5313 Q26.9063,161.875 29.4063,161.875 Q30.1094,161.875 30.75,162.0313 Q31.4063,162.1875 31.9688,162.4844 L31.9688,165.2031 Q31.3438,164.625 30.75,164.3594 Q30.1563,164.0781 29.5313,164.0781 Q28.1875,164.0781 27.5,165.1563 Q26.8125,166.2188 26.8125,168.3125 Q26.8125,170.4063 27.5,171.4844 Q28.1875,172.5469 29.5313,172.5469 Q30.1563,172.5469 30.75,172.2813 Q31.3438,172 31.9688,171.4219 L31.9688,174.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="43" y="172.6543">Layer3</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="32" x="92" y="149.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="93" y="161.6387">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="120" y1="184.5" y2="184.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="120" y1="192.5" y2="192.5"/><!--MD5=[f96bda7061fade8d5e754be9cbbd90c4]
-class C_0000000332--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="48" id="C_0000000332" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="124.5" y="14.5"/><ellipse cx="139.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M142.4688,36.1406 Q141.8906,36.4375 141.25,36.5781 Q140.6094,36.7344 139.9063,36.7344 Q137.4063,36.7344 136.0781,35.0938 Q134.7656,33.4375 134.7656,30.3125 Q134.7656,27.1875 136.0781,25.5313 Q137.4063,23.875 139.9063,23.875 Q140.6094,23.875 141.25,24.0313 Q141.9063,24.1875 142.4688,24.4844 L142.4688,27.2031 Q141.8438,26.625 141.25,26.3594 Q140.6563,26.0781 140.0313,26.0781 Q138.6875,26.0781 138,27.1563 Q137.3125,28.2188 137.3125,30.3125 Q137.3125,32.4063 138,33.4844 Q138.6875,34.5469 140.0313,34.5469 Q140.6563,34.5469 141.25,34.2813 Q141.8438,34 142.4688,33.4219 L142.4688,36.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="153.5" y="34.6543">Layer2</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="202.5" y="11.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="203.5" y="23.6387">Layer3&lt;Base&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="125.5" x2="293.5" y1="46.5" y2="46.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="125.5" x2="293.5" y1="54.5" y2="54.5"/><!--MD5=[99df25cfd295dd29ef3af08f98ad6218]
-class C_0000000331--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="48" id="C_0000000331" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="368" y="152.5"/><ellipse cx="383" cy="168.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M385.9688,174.1406 Q385.3906,174.4375 384.75,174.5781 Q384.1094,174.7344 383.4063,174.7344 Q380.9063,174.7344 379.5781,173.0938 Q378.2656,171.4375 378.2656,168.3125 Q378.2656,165.1875 379.5781,163.5313 Q380.9063,161.875 383.4063,161.875 Q384.1094,161.875 384.75,162.0313 Q385.4063,162.1875 385.9688,162.4844 L385.9688,165.2031 Q385.3438,164.625 384.75,164.3594 Q384.1563,164.0781 383.5313,164.0781 Q382.1875,164.0781 381.5,165.1563 Q380.8125,166.2188 380.8125,168.3125 Q380.8125,170.4063 381.5,171.4844 Q382.1875,172.5469 383.5313,172.5469 Q384.1563,172.5469 384.75,172.2813 Q385.3438,172 385.9688,171.4219 L385.9688,174.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="397" y="172.6543">Layer1</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="158" x="446" y="149.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="447" y="161.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="600" y1="184.5" y2="184.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="600" y1="192.5" y2="192.5"/><!--MD5=[79fb9d02297347999fbbe0cf90c26655]
-class C_0000000329--><rect fill="#FEFECE" filter="url(#f1nf4t5xg3jzz4)" height="60.8047" id="C_0000000329" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="329.5" y="8"/><ellipse cx="508.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M511.2188,29.6406 Q510.6406,29.9375 510,30.0781 Q509.3594,30.2344 508.6563,30.2344 Q506.1563,30.2344 504.8281,28.5938 Q503.5156,26.9375 503.5156,23.8125 Q503.5156,20.6875 504.8281,19.0313 Q506.1563,17.375 508.6563,17.375 Q509.3594,17.375 510,17.5313 Q510.6563,17.6875 511.2188,17.9844 L511.2188,20.7031 Q510.5938,20.125 510,19.8594 Q509.4063,19.5781 508.7813,19.5781 Q507.4375,19.5781 506.75,20.6563 Q506.0625,21.7188 506.0625,23.8125 Q506.0625,25.9063 506.75,26.9844 Q507.4375,28.0469 508.7813,28.0469 Q509.4063,28.0469 510,27.7813 Q510.5938,27.5 511.2188,26.9219 L511.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="528.75" y="28.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330.5" x2="702.5" y1="40" y2="40"/><ellipse cx="340.5" cy="51" 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="348" x="349.5" y="54.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330.5" x2="702.5" y1="60.8047" y2="60.8047"/><!--MD5=[76fe3f787ae3dd2b1d3c7a069a02003a]
-reverse link C_0000000323 to C_0000000333--><path d="M80.95,260.73 C81.27,239.11 80.13,216.7 77.52,200.59 " fill="none" id="C_0000000323&lt;-C_0000000333" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="87.93,261.27,80.18,280.99,73.94,260.74,87.93,261.27" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[71544c01426876d4616573c86a055d1d]
-link C_0000000333 to C_0000000323--><path d="M58.04,200.59 C54.99,220.52 54.06,250.09 55.25,275.88 " fill="none" id="C_0000000333-&gt;C_0000000323" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="55.52,280.99,59.0263,271.7864,55.249,275.9974,51.038,272.2201,55.52,280.99" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e924c2d73a59f78bbb42fcd0a202e3f0]
-reverse link C_0000000333 to C_0000000332--><path d="M117.42,139.27 C145.16,114.93 177.34,83.57 195.85,62.57 " fill="none" id="C_0000000333&lt;-C_0000000332" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="121.91,144.64,102.16,152.32,112.81,134,121.91,144.64" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b9d64e44860e08a991adb5dbf36ab17b]
-link C_0000000332 to C_0000000333--><path d="M175.56,62.57 C147.11,86.31 108.33,123.27 85.38,148.39 " fill="none" id="C_0000000332-&gt;C_0000000333" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="81.83,152.32,90.84,148.3426,85.1898,148.6171,84.9153,142.9669,81.83,152.32" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d2cd4ed6d8b3c4af85a2b5228504a828]
-reverse link C_0000000332 to C_0000000331--><path d="M264,71.92 C311.46,96.68 379.63,130.2 427.75,152.32 " fill="none" id="C_0000000332&lt;-C_0000000331" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="260.71,78.1,246.3,62.57,267.25,65.72,260.71,78.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f63b98ad8973d91a4bff499a1c5312c1]
-link C_0000000331 to C_0000000332--><path d="M448.07,152.32 C402.85,128 325.91,89.89 271.45,64.81 " fill="none" id="C_0000000331-&gt;C_0000000332" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="266.58,62.57,273.0902,69.9604,271.124,64.6562,276.4281,62.69,266.58,62.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6c11baead3084e03ae7fb52e8494bfad]
-link C_0000000333 to C_0000000327--><path d="M93.62,200.59 C110.04,215.09 132.24,234.71 154.36,254.26 " fill="none" id="C_0000000333-&gt;C_0000000327" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="159.23,249.23,169.59,267.72,149.96,259.72,159.23,249.23" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[584e3d37580fab078f1e9d762e417546]
-link C_0000000332 to C_0000000321--><path d="M215.44,62.57 C219.9,79.91 226.18,104.32 231.76,126 " fill="none" id="C_0000000332-&gt;C_0000000321" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="238.61,124.53,236.82,145.64,225.05,128.02,238.61,124.53" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0b4b82585f31fce783fcc3583bdde972]
-link C_0000000331 to C_0000000325--><path d="M484.5,200.59 C484.5,219.86 484.5,248.14 484.5,273.3 " fill="none" id="C_0000000331-&gt;C_0000000325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="491.5,273.44,484.5,293.44,477.5,273.44,491.5,273.44" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8cde4b0c2f9491595a59e2101c9e5379]
-reverse link C_0000000329 to C_0000000331--><path d="M506.56,81.72 C501.08,105.01 494.49,133.04 489.95,152.35 " fill="none" id="C_0000000329&lt;-C_0000000331" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="509.56,69.01,504.2893,73.9314,506.8049,80.6894,512.0756,75.7681,509.56,69.01" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="508.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="38" x="515.5" y="112.0669">layers</text><!--MD5=[36536ea5c3e1015b02fc96ea4f34dfba]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:714px;height:403px;" version="1.1" viewBox="0 0 714 403" width="714px" zoomAndPan="magnify"><defs><filter height="300%" id="f15cmcgskbncua" 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></defs><g><!--MD5=[7982e1368564f0953091c16926451cc2]
+class C_0000000362--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="60.8047" id="C_0000000362" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="156" y="146"/><ellipse cx="183.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M186.1188,167.6406 Q185.5406,167.9375 184.9,168.0781 Q184.2594,168.2344 183.5563,168.2344 Q181.0563,168.2344 179.7281,166.5938 Q178.4156,164.9375 178.4156,161.8125 Q178.4156,158.6875 179.7281,157.0313 Q181.0563,155.375 183.5563,155.375 Q184.2594,155.375 184.9,155.5313 Q185.5563,155.6875 186.1188,155.9844 L186.1188,158.7031 Q185.4938,158.125 184.9,157.8594 Q184.3063,157.5781 183.6813,157.5781 Q182.3375,157.5781 181.65,158.6563 Q180.9625,159.7188 180.9625,161.8125 Q180.9625,163.9063 181.65,164.9844 Q182.3375,166.0469 183.6813,166.0469 Q184.3063,166.0469 184.9,165.7813 Q185.4938,165.5 186.1188,164.9219 L186.1188,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="199.85" y="166.1543">Layer2</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="261" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="262" y="155.1387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="332" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="332" y1="186" y2="186"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="164" y="194"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="176" y="200.2104">all_calls_count() const : int</text><!--MD5=[6167dae62a5a1fe284981cb92fa26b73]
+class C_0000000366--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="99.2188" id="C_0000000366" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="281"/><ellipse cx="48" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M50.9688,302.6406 Q50.3906,302.9375 49.75,303.0781 Q49.1094,303.2344 48.4063,303.2344 Q45.9063,303.2344 44.5781,301.5938 Q43.2656,299.9375 43.2656,296.8125 Q43.2656,293.6875 44.5781,292.0313 Q45.9063,290.375 48.4063,290.375 Q49.1094,290.375 49.75,290.5313 Q50.4063,290.6875 50.9688,290.9844 L50.9688,293.7031 Q50.3438,293.125 49.75,292.8594 Q49.1563,292.5781 48.5313,292.5781 Q47.1875,292.5781 46.5,293.6563 Q45.8125,294.7188 45.8125,296.8125 Q45.8125,298.9063 46.5,299.9844 Q47.1875,301.0469 48.5313,301.0469 Q49.1563,301.0469 49.75,300.7813 Q50.3438,300.5 50.9688,299.9219 L50.9688,302.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="68" y="301.1543">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="313" y2="313"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="321" y2="321"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="329"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="72" x="26" y="335.2104">Base() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="341.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="81" x="26" y="348.0151">~Base() : void</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="354.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="360.8198">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="367.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="373.6245">m2() : std::string</text><!--MD5=[818945bf3a57e7b5dc3aca78eb889494]
+class C_0000000370--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="73.6094" id="C_0000000370" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="409.5" y="293.5"/><ellipse cx="424.5" cy="309.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M427.4688,315.1406 Q426.8906,315.4375 426.25,315.5781 Q425.6094,315.7344 424.9063,315.7344 Q422.4063,315.7344 421.0781,314.0938 Q419.7656,312.4375 419.7656,309.3125 Q419.7656,306.1875 421.0781,304.5313 Q422.4063,302.875 424.9063,302.875 Q425.6094,302.875 426.25,303.0313 Q426.9063,303.1875 427.4688,303.4844 L427.4688,306.2031 Q426.8438,305.625 426.25,305.3594 Q425.6563,305.0781 425.0313,305.0781 Q423.6875,305.0781 423,306.1563 Q422.3125,307.2188 422.3125,309.3125 Q422.3125,311.4063 423,312.4844 Q423.6875,313.5469 425.0313,313.5469 Q425.6563,313.5469 426.25,313.2813 Q426.8438,313 427.4688,312.4219 L427.4688,315.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="438.5" y="313.6543">Layer1</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="487.5" y="290.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="488.5" y="302.6387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="410.5" x2="558.5" y1="325.5" y2="325.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="410.5" x2="558.5" y1="333.5" y2="333.5"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="417.5" y="341.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="429.5" y="347.7104">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="417.5" y="354.3047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="429.5" y="360.5151">m2() : std::string</text><!--MD5=[caa5c329365d4eeb78bd619a3a2da8d1]
+class C_0000000374--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="124.8281" id="C_0000000374" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="164.5" y="268"/><ellipse cx="179.5" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M182.4688,289.6406 Q181.8906,289.9375 181.25,290.0781 Q180.6094,290.2344 179.9063,290.2344 Q177.4063,290.2344 176.0781,288.5938 Q174.7656,286.9375 174.7656,283.8125 Q174.7656,280.6875 176.0781,279.0313 Q177.4063,277.375 179.9063,277.375 Q180.6094,277.375 181.25,277.5313 Q181.9063,277.6875 182.4688,277.9844 L182.4688,280.7031 Q181.8438,280.125 181.25,279.8594 Q180.6563,279.5781 180.0313,279.5781 Q178.6875,279.5781 178,280.6563 Q177.3125,281.7188 177.3125,283.8125 Q177.3125,285.9063 178,286.9844 Q178.6875,288.0469 180.0313,288.0469 Q180.6563,288.0469 181.25,287.7813 Q181.8438,287.5 182.4688,286.9219 L182.4688,289.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="193.5" y="288.1543">Layer3</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="242.5" y="265"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="243.5" y="277.1387">LowerLayer</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165.5" x2="313.5" y1="300" y2="300"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="184.5" y="314.2104">m_m1_calls : int</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="320.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="184.5" y="327.0151">m_m2_calls : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165.5" x2="313.5" y1="333.6094" y2="333.6094"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="341.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="184.5" y="347.8198">m1() : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="354.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184.5" y="360.6245">m2() : std::string</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="367.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="184.5" y="373.4292">m1_calls() const : int</text><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="172.5" y="380.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="184.5" y="386.2339">m2_calls() const : int</text><!--MD5=[24daf2dd44c37cdc9b5908969090760e]
+class C_0000000382--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="48" id="C_0000000382" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="14" y="152.5"/><ellipse cx="29" cy="168.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M31.9688,174.1406 Q31.3906,174.4375 30.75,174.5781 Q30.1094,174.7344 29.4063,174.7344 Q26.9063,174.7344 25.5781,173.0938 Q24.2656,171.4375 24.2656,168.3125 Q24.2656,165.1875 25.5781,163.5313 Q26.9063,161.875 29.4063,161.875 Q30.1094,161.875 30.75,162.0313 Q31.4063,162.1875 31.9688,162.4844 L31.9688,165.2031 Q31.3438,164.625 30.75,164.3594 Q30.1563,164.0781 29.5313,164.0781 Q28.1875,164.0781 27.5,165.1563 Q26.8125,166.2188 26.8125,168.3125 Q26.8125,170.4063 27.5,171.4844 Q28.1875,172.5469 29.5313,172.5469 Q30.1563,172.5469 30.75,172.2813 Q31.3438,172 31.9688,171.4219 L31.9688,174.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="43" y="172.6543">Layer3</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="32" x="92" y="149.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="93" y="161.6387">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="120" y1="184.5" y2="184.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="120" y1="192.5" y2="192.5"/><!--MD5=[4cdbe86c41eb49e3a79ca5c5867edbe9]
+class C_0000000381--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="48" id="C_0000000381" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="124.5" y="14.5"/><ellipse cx="139.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M142.4688,36.1406 Q141.8906,36.4375 141.25,36.5781 Q140.6094,36.7344 139.9063,36.7344 Q137.4063,36.7344 136.0781,35.0938 Q134.7656,33.4375 134.7656,30.3125 Q134.7656,27.1875 136.0781,25.5313 Q137.4063,23.875 139.9063,23.875 Q140.6094,23.875 141.25,24.0313 Q141.9063,24.1875 142.4688,24.4844 L142.4688,27.2031 Q141.8438,26.625 141.25,26.3594 Q140.6563,26.0781 140.0313,26.0781 Q138.6875,26.0781 138,27.1563 Q137.3125,28.2188 137.3125,30.3125 Q137.3125,32.4063 138,33.4844 Q138.6875,34.5469 140.0313,34.5469 Q140.6563,34.5469 141.25,34.2813 Q141.8438,34 142.4688,33.4219 L142.4688,36.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="153.5" y="34.6543">Layer2</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="202.5" y="11.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="203.5" y="23.6387">Layer3&lt;Base&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="125.5" x2="293.5" y1="46.5" y2="46.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="125.5" x2="293.5" y1="54.5" y2="54.5"/><!--MD5=[fc6ea200b2796d5e0ba94a62f77701ed]
+class C_0000000380--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="48" id="C_0000000380" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="368" y="152.5"/><ellipse cx="383" cy="168.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M385.9688,174.1406 Q385.3906,174.4375 384.75,174.5781 Q384.1094,174.7344 383.4063,174.7344 Q380.9063,174.7344 379.5781,173.0938 Q378.2656,171.4375 378.2656,168.3125 Q378.2656,165.1875 379.5781,163.5313 Q380.9063,161.875 383.4063,161.875 Q384.1094,161.875 384.75,162.0313 Q385.4063,162.1875 385.9688,162.4844 L385.9688,165.2031 Q385.3438,164.625 384.75,164.3594 Q384.1563,164.0781 383.5313,164.0781 Q382.1875,164.0781 381.5,165.1563 Q380.8125,166.2188 380.8125,168.3125 Q380.8125,170.4063 381.5,171.4844 Q382.1875,172.5469 383.5313,172.5469 Q384.1563,172.5469 384.75,172.2813 Q385.3438,172 385.9688,171.4219 L385.9688,174.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="397" y="172.6543">Layer1</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="158" x="446" y="149.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="447" y="161.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="600" y1="184.5" y2="184.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="600" y1="192.5" y2="192.5"/><!--MD5=[68cfec9e35cb3f3c6d1f0641a7c95a86]
+class C_0000000378--><rect fill="#FEFECE" filter="url(#f15cmcgskbncua)" height="60.8047" id="C_0000000378" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="329.5" y="8"/><ellipse cx="508.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M511.2188,29.6406 Q510.6406,29.9375 510,30.0781 Q509.3594,30.2344 508.6563,30.2344 Q506.1563,30.2344 504.8281,28.5938 Q503.5156,26.9375 503.5156,23.8125 Q503.5156,20.6875 504.8281,19.0313 Q506.1563,17.375 508.6563,17.375 Q509.3594,17.375 510,17.5313 Q510.6563,17.6875 511.2188,17.9844 L511.2188,20.7031 Q510.5938,20.125 510,19.8594 Q509.4063,19.5781 508.7813,19.5781 Q507.4375,19.5781 506.75,20.6563 Q506.0625,21.7188 506.0625,23.8125 Q506.0625,25.9063 506.75,26.9844 Q507.4375,28.0469 508.7813,28.0469 Q509.4063,28.0469 510,27.7813 Q510.5938,27.5 511.2188,26.9219 L511.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="528.75" y="28.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330.5" x2="702.5" y1="40" y2="40"/><ellipse cx="340.5" cy="51" 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="348" x="349.5" y="54.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="330.5" x2="702.5" y1="60.8047" y2="60.8047"/><!--MD5=[05f2812c3b781af65a667a1de7e10e25]
+link C_0000000382 to C_0000000366--><path d="M58.04,200.59 C54.99,220.52 54.06,250.09 55.25,275.88 " fill="none" id="C_0000000382-&gt;C_0000000366" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="55.52,280.99,59.0263,271.7864,55.249,275.9974,51.038,272.2201,55.52,280.99" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0971f0c4d16d4368bf94907af74ac844]
+reverse link C_0000000366 to C_0000000382--><path d="M80.95,260.73 C81.27,239.11 80.13,216.7 77.52,200.59 " fill="none" id="C_0000000366&lt;-C_0000000382" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="87.93,261.27,80.18,280.99,73.94,260.74,87.93,261.27" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[fceb26e51cba3364baa02a1162e6d2a5]
+link C_0000000382 to C_0000000374--><path d="M93.62,200.59 C110.04,215.09 132.24,234.71 154.36,254.26 " fill="none" id="C_0000000382-&gt;C_0000000374" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="159.23,249.23,169.59,267.72,149.96,259.72,159.23,249.23" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d0c1c30e578f9be9151c1984f075dd84]
+link C_0000000381 to C_0000000382--><path d="M175.56,62.57 C147.11,86.31 108.33,123.27 85.38,148.39 " fill="none" id="C_0000000381-&gt;C_0000000382" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="81.83,152.32,90.84,148.3426,85.1898,148.6171,84.9153,142.9669,81.83,152.32" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d4b81529454c060996b62c43bd9c5f36]
+reverse link C_0000000382 to C_0000000381--><path d="M117.42,139.27 C145.16,114.93 177.34,83.57 195.85,62.57 " fill="none" id="C_0000000382&lt;-C_0000000381" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="121.91,144.64,102.16,152.32,112.81,134,121.91,144.64" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2b6676413e8c7321d75b858a91e74d54]
+link C_0000000381 to C_0000000362--><path d="M215.44,62.57 C219.9,79.91 226.18,104.32 231.76,126 " fill="none" id="C_0000000381-&gt;C_0000000362" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="238.61,124.53,236.82,145.64,225.05,128.02,238.61,124.53" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0e534cd738f8ac148d5a1f0f4dc5cd67]
+link C_0000000380 to C_0000000381--><path d="M448.07,152.32 C402.85,128 325.91,89.89 271.45,64.81 " fill="none" id="C_0000000380-&gt;C_0000000381" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="266.58,62.57,273.0902,69.9604,271.124,64.6562,276.4281,62.69,266.58,62.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[64775c93138370b4b20afbb27924de4d]
+reverse link C_0000000381 to C_0000000380--><path d="M264,71.92 C311.46,96.68 379.63,130.2 427.75,152.32 " fill="none" id="C_0000000381&lt;-C_0000000380" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="260.71,78.1,246.3,62.57,267.25,65.72,260.71,78.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3a1f014755d32806fee7759c1bbc0669]
+link C_0000000380 to C_0000000370--><path d="M484.5,200.59 C484.5,219.86 484.5,248.14 484.5,273.3 " fill="none" id="C_0000000380-&gt;C_0000000370" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="491.5,273.44,484.5,293.44,477.5,273.44,491.5,273.44" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[22ed76f8593531d2816fb4334a9cd260]
+reverse link C_0000000378 to C_0000000380--><path d="M506.56,81.72 C501.08,105.01 494.49,133.04 489.95,152.35 " fill="none" id="C_0000000378&lt;-C_0000000380" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="509.56,69.01,504.2893,73.9314,506.8049,80.6894,512.0756,75.7681,509.56,69.01" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="508.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="38" x="515.5" y="112.0669">layers</text><!--MD5=[e720c11ad5d59663d56c9bc8d0716536]
 @startuml
-class "Layer2<LowerLayer>" as C_0000000321
-class C_0000000321 {
+
+class "Layer2<LowerLayer>" as C_0000000362
+class C_0000000362 {
 -all_calls_count() const : int
 }
 
-class "Base" as C_0000000323
-class C_0000000323 {
+class "Base" as C_0000000366
+class C_0000000366 {
 {static} -Base() : void
 {static} -~Base() : void
 -m1() : int
 -m2() : std::string
 }
 
-class "Layer1<LowerLayer>" as C_0000000325
-class C_0000000325 {
+class "Layer1<LowerLayer>" as C_0000000370
+class C_0000000370 {
 -m1() : int
 -m2() : std::string
 }
 
-class "Layer3<LowerLayer>" as C_0000000327
-class C_0000000327 {
+class "Layer3<LowerLayer>" as C_0000000374
+class C_0000000374 {
 -m1() : int
 -m2() : std::string
 -m1_calls() const : int
@@ -47,33 +48,33 @@ class C_0000000327 {
 -m_m2_calls : int
 }
 
-class "Layer3<Base>" as C_0000000333
-class C_0000000333 {
+class "Layer3<Base>" as C_0000000382
+class C_0000000382 {
 }
-C_0000000323 <|- - C_0000000333
 
-class "Layer2<Layer3<Base>>" as C_0000000332
-class C_0000000332 {
+class "Layer2<Layer3<Base>>" as C_0000000381
+class C_0000000381 {
 }
-C_0000000333 <|- - C_0000000332
 
-class "Layer1<Layer2<Layer3<Base>>>" as C_0000000331
-class C_0000000331 {
+class "Layer1<Layer2<Layer3<Base>>>" as C_0000000380
+class C_0000000380 {
 }
-C_0000000332 <|- - C_0000000331
 
-class "A" as C_0000000329
-class C_0000000329 {
+class "A" as C_0000000378
+class C_0000000378 {
 +layers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>>
 }
 
-C_0000000333 ..> C_0000000323
-C_0000000333 ..|> C_0000000327
-C_0000000332 ..> C_0000000333
-C_0000000332 ..|> C_0000000321
-C_0000000331 ..> C_0000000332
-C_0000000331 ..|> C_0000000325
-C_0000000329 o- - C_0000000331 : +layers
+C_0000000382 ..> C_0000000366
+C_0000000382 ..|> C_0000000374
+C_0000000366 <|- - C_0000000382
+C_0000000381 ..> C_0000000382
+C_0000000381 ..|> C_0000000362
+C_0000000382 <|- - C_0000000381
+C_0000000380 ..> C_0000000381
+C_0000000380 ..|> C_0000000370
+C_0000000381 <|- - C_0000000380
+C_0000000378 o- - C_0000000380 : +layers
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 1da90c09..ec08620a 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,84 +1,85 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:1144px;height:360px;" version="1.1" viewBox="0 0 1144 360" width="1144px" zoomAndPan="magnify"><defs><filter height="300%" id="f7gglsx1eveu5" 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></defs><g><!--MD5=[d229082899d8176eed2f7b38e02f42fd]
-class C_0000000339--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="73.6094" id="C_0000000339" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="769" y="8"/><ellipse cx="833.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M833.3594,19.3438 L832.2031,24.4219 L834.5313,24.4219 L833.3594,19.3438 Z M831.875,17.1094 L834.8594,17.1094 L838.2188,29.5 L835.7656,29.5 L835,26.4375 L831.7188,26.4375 L830.9688,29.5 L828.5313,29.5 L831.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="853.75" y="28.1543">ProductA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="48" y2="48"/><ellipse cx="780" cy="59" 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" text-decoration="underline" textLength="102" x="789" y="62.2104">~ProductA() : void</text><ellipse cx="780" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="789" y="75.0151">sell(int price) const = 0 : bool</text><!--MD5=[2d5accd6242763c7ac1c4c3010abb2d1]
-class C_0000000341--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="60.8047" id="C_0000000341" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="212" y="148.5"/><ellipse cx="260.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M263.7188,170.1406 Q263.1406,170.4375 262.5,170.5781 Q261.8594,170.7344 261.1563,170.7344 Q258.6563,170.7344 257.3281,169.0938 Q256.0156,167.4375 256.0156,164.3125 Q256.0156,161.1875 257.3281,159.5313 Q258.6563,157.875 261.1563,157.875 Q261.8594,157.875 262.5,158.0313 Q263.1563,158.1875 263.7188,158.4844 L263.7188,161.2031 Q263.0938,160.625 262.5,160.3594 Q261.9063,160.0781 261.2813,160.0781 Q259.9375,160.0781 259.25,161.1563 Q258.5625,162.2188 258.5625,164.3125 Q258.5625,166.4063 259.25,167.4844 Q259.9375,168.5469 261.2813,168.5469 Q261.9063,168.5469 262.5,168.2813 Q263.0938,168 263.7188,167.4219 L263.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="281.25" y="168.6543">ProductA1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="188.5" y2="188.5"/><ellipse cx="223" cy="199.5" 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="145" x="232" y="202.7104">sell(int price) const : bool</text><!--MD5=[f41c894bcdd87295566c4df9391cd686]
-class C_0000000343--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="60.8047" id="C_0000000343" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="962" y="148.5"/><ellipse cx="1010.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1013.7188,170.1406 Q1013.1406,170.4375 1012.5,170.5781 Q1011.8594,170.7344 1011.1563,170.7344 Q1008.6563,170.7344 1007.3281,169.0938 Q1006.0156,167.4375 1006.0156,164.3125 Q1006.0156,161.1875 1007.3281,159.5313 Q1008.6563,157.875 1011.1563,157.875 Q1011.8594,157.875 1012.5,158.0313 Q1013.1563,158.1875 1013.7188,158.4844 L1013.7188,161.2031 Q1013.0938,160.625 1012.5,160.3594 Q1011.9063,160.0781 1011.2813,160.0781 Q1009.9375,160.0781 1009.25,161.1563 Q1008.5625,162.2188 1008.5625,164.3125 Q1008.5625,166.4063 1009.25,167.4844 Q1009.9375,168.5469 1011.2813,168.5469 Q1011.9063,168.5469 1012.5,168.2813 Q1013.0938,168 1013.7188,167.4219 L1013.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="1031.25" y="168.6543">ProductA2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="188.5" y2="188.5"/><ellipse cx="973" cy="199.5" 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="145" x="982" y="202.7104">sell(int price) const : bool</text><!--MD5=[b2f49a1225e23cba57ad105cd8c13d75]
-class C_0000000345--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="73.6094" id="C_0000000345" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="357" y="8"/><ellipse cx="422.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M422.3594,19.3438 L421.2031,24.4219 L423.5313,24.4219 L422.3594,19.3438 Z M420.875,17.1094 L423.8594,17.1094 L427.2188,29.5 L424.7656,29.5 L424,26.4375 L420.7188,26.4375 L419.9688,29.5 L417.5313,29.5 L420.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="442.75" y="28.1543">ProductB</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="48" y2="48"/><ellipse cx="368" cy="59" 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" text-decoration="underline" textLength="103" x="377" y="62.2104">~ProductB() : void</text><ellipse cx="368" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="377" y="75.0151">buy(int price) const = 0 : bool</text><!--MD5=[fd77626c7d68ba61216307587d645341]
-class C_0000000347--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="60.8047" id="C_0000000347" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="6" y="148.5"/><ellipse cx="54.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M57.7188,170.1406 Q57.1406,170.4375 56.5,170.5781 Q55.8594,170.7344 55.1563,170.7344 Q52.6563,170.7344 51.3281,169.0938 Q50.0156,167.4375 50.0156,164.3125 Q50.0156,161.1875 51.3281,159.5313 Q52.6563,157.875 55.1563,157.875 Q55.8594,157.875 56.5,158.0313 Q57.1563,158.1875 57.7188,158.4844 L57.7188,161.2031 Q57.0938,160.625 56.5,160.3594 Q55.9063,160.0781 55.2813,160.0781 Q53.9375,160.0781 53.25,161.1563 Q52.5625,162.2188 52.5625,164.3125 Q52.5625,166.4063 53.25,167.4844 Q53.9375,168.5469 55.2813,168.5469 Q55.9063,168.5469 56.5,168.2813 Q57.0938,168 57.7188,167.4219 L57.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="75.25" y="168.6543">ProductB1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="188.5" y2="188.5"/><ellipse cx="17" cy="199.5" 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="145" x="26" y="202.7104">buy(int price) const : bool</text><!--MD5=[dc892ae3eaf42aa5af59174824168865]
-class C_0000000349--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="60.8047" id="C_0000000349" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="756" y="148.5"/><ellipse cx="804.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M807.7188,170.1406 Q807.1406,170.4375 806.5,170.5781 Q805.8594,170.7344 805.1563,170.7344 Q802.6563,170.7344 801.3281,169.0938 Q800.0156,167.4375 800.0156,164.3125 Q800.0156,161.1875 801.3281,159.5313 Q802.6563,157.875 805.1563,157.875 Q805.8594,157.875 806.5,158.0313 Q807.1563,158.1875 807.7188,158.4844 L807.7188,161.2031 Q807.0938,160.625 806.5,160.3594 Q805.9063,160.0781 805.2813,160.0781 Q803.9375,160.0781 803.25,161.1563 Q802.5625,162.2188 802.5625,164.3125 Q802.5625,166.4063 803.25,167.4844 Q803.9375,168.5469 805.2813,168.5469 Q805.9063,168.5469 806.5,168.2813 Q807.0938,168 807.7188,167.4219 L807.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="825.25" y="168.6543">ProductB2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="188.5" y2="188.5"/><ellipse cx="767" cy="199.5" 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="145" x="776" y="202.7104">buy(int price) const : bool</text><!--MD5=[be1a93fdb3e0d54a8e213ac3a10ef939]
-class C_0000000351--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="73.6094" id="C_0000000351" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="418.5" y="142"/><ellipse cx="515.75" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M515.8594,153.3438 L514.7031,158.4219 L517.0313,158.4219 L515.8594,153.3438 Z M514.375,151.1094 L517.3594,151.1094 L520.7188,163.5 L518.2656,163.5 L517.5,160.4375 L514.2188,160.4375 L513.4688,163.5 L511.0313,163.5 L514.375,151.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="536.25" y="162.1543">AbstractFactory</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="174" y2="174"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="182" y2="182"/><ellipse cx="429.5" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="196.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="429.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="209.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[89282a7e987a1d0b67125aff40fcb28b]
-class C_0000000353--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="73.6094" id="C_0000000353" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="157.5" y="276"/><ellipse cx="266.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M269.2188,297.6406 Q268.6406,297.9375 268,298.0781 Q267.3594,298.2344 266.6563,298.2344 Q264.1563,298.2344 262.8281,296.5938 Q261.5156,294.9375 261.5156,291.8125 Q261.5156,288.6875 262.8281,287.0313 Q264.1563,285.375 266.6563,285.375 Q267.3594,285.375 268,285.5313 Q268.6563,285.6875 269.2188,285.9844 L269.2188,288.7031 Q268.5938,288.125 268,287.8594 Q267.4063,287.5781 266.7813,287.5781 Q265.4375,287.5781 264.75,288.6563 Q264.0625,289.7188 264.0625,291.8125 Q264.0625,293.9063 264.75,294.9844 Q265.4375,296.0469 266.7813,296.0469 Q267.4063,296.0469 268,295.7813 Q268.5938,295.5 269.2188,294.9219 L269.2188,297.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="286.75" y="296.1543">Factory1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="308" y2="308"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="316" y2="316"/><ellipse cx="168.5" cy="327" 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="253" x="177.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="168.5" cy="339.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="254" x="177.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[01aab8383dcbe3c9b4619f8c440894c4]
-class C_0000000355--><rect fill="#FEFECE" filter="url(#f7gglsx1eveu5)" height="73.6094" id="C_0000000355" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="701.5" y="276"/><ellipse cx="810.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M813.2188,297.6406 Q812.6406,297.9375 812,298.0781 Q811.3594,298.2344 810.6563,298.2344 Q808.1563,298.2344 806.8281,296.5938 Q805.5156,294.9375 805.5156,291.8125 Q805.5156,288.6875 806.8281,287.0313 Q808.1563,285.375 810.6563,285.375 Q811.3594,285.375 812,285.5313 Q812.6563,285.6875 813.2188,285.9844 L813.2188,288.7031 Q812.5938,288.125 812,287.8594 Q811.4063,287.5781 810.7813,287.5781 Q809.4375,287.5781 808.75,288.6563 Q808.0625,289.7188 808.0625,291.8125 Q808.0625,293.9063 808.75,294.9844 Q809.4375,296.0469 810.7813,296.0469 Q811.4063,296.0469 812,295.7813 Q812.5938,295.5 813.2188,294.9219 L813.2188,297.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="830.75" y="296.1543">Factory2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="308" y2="308"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="316" y2="316"/><ellipse cx="712.5" cy="327" 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="253" x="721.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="712.5" cy="339.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="254" x="721.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[586d89882bf21248f10112e18b32636b]
-reverse link C_0000000339 to C_0000000341--><path d="M748.87,65.81 C654.43,82.89 518.37,109.83 401.5,142 C394.41,143.95 387.1,146.13 379.79,148.43 " fill="none" id="C_0000000339&lt;-C_0000000341" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="747.74,58.9,768.66,62.27,750.21,72.68,747.74,58.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[94a417b291900a5587dbc78c4ef47c82]
-reverse link C_0000000339 to C_0000000343--><path d="M931.67,93.99 C956.78,112.2 984.63,132.4 1006.73,148.43 " fill="none" id="C_0000000339&lt;-C_0000000343" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="927.31,99.48,915.23,82.07,935.53,88.15,927.31,99.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3605f384b5a5f4d241040abfa86c0079]
-reverse link C_0000000345 to C_0000000347--><path d="M337.74,88.46 C283.96,108.02 221.44,130.75 172.86,148.41 " fill="none" id="C_0000000345&lt;-C_0000000347" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="335.56,81.8,356.75,81.55,340.34,94.96,335.56,81.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[da2eed368dd436c1d0988c1ce151ab36]
-reverse link C_0000000345 to C_0000000349--><path d="M571.34,85.2 C622.67,102.49 683.62,123.13 738.5,142 C744.59,144.09 750.88,146.27 757.21,148.46 " fill="none" id="C_0000000345&lt;-C_0000000349" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="568.9,91.76,552.18,78.74,573.37,78.49,568.9,91.76" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[368386c38ca6566943575a2f4e5baed6]
-reverse link C_0000000351 to C_0000000353--><path d="M477.11,224.83 C442.76,241.51 404.26,260.19 371.74,275.97 " fill="none" id="C_0000000351&lt;-C_0000000353" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="474.13,218.5,495.17,216.07,480.24,231.1,474.13,218.5" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a598ab51f63adb1339a50614edc0cbd4]
-reverse link C_0000000351 to C_0000000355--><path d="M661.89,224.83 C696.24,241.51 734.74,260.19 767.26,275.97 " fill="none" id="C_0000000351&lt;-C_0000000355" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="658.76,231.1,643.83,216.07,664.87,218.5,658.76,231.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0fb9ce88d46687e5bddcf64393cae442]
-reverse link C_0000000341 to C_0000000353--><path d="M297.5,214.81 C297.5,233.64 297.5,256.87 297.5,275.89 " fill="none" id="C_0000000341&lt;-C_0000000353" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="297.5,209.62,293.5,218.62,297.5,214.62,301.5,218.62,297.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[625aaa9cf74bc8029f1720080e24b7b4]
-reverse link C_0000000347 to C_0000000353--><path d="M142.1,212.42 C172.1,231.65 210.19,256.05 241.15,275.89 " fill="none" id="C_0000000347&lt;-C_0000000353" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="137.73,209.62,143.1574,217.8385,141.9424,212.3136,147.4672,211.0986,137.73,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4cde55ca8e7edb4e987a3916ab3d4be8]
-reverse link C_0000000343 to C_0000000355--><path d="M996.9,212.42 C966.9,231.65 928.81,256.05 897.85,275.89 " fill="none" id="C_0000000343&lt;-C_0000000355" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1001.27,209.62,991.5328,211.0986,997.0576,212.3136,995.8426,217.8385,1001.27,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ccefb7572a1014bf45d020718c3c076e]
-reverse link C_0000000349 to C_0000000355--><path d="M841.5,214.81 C841.5,233.64 841.5,256.87 841.5,275.89 " fill="none" id="C_0000000349&lt;-C_0000000355" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="841.5,209.62,837.5,218.62,841.5,214.62,845.5,218.62,841.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[608e33596602dce7a22c84962e343779]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:1144px;height:360px;" version="1.1" viewBox="0 0 1144 360" width="1144px" zoomAndPan="magnify"><defs><filter height="300%" id="fwrspm01dofr8" 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></defs><g><!--MD5=[31f8c2d11943b697fabf99a348f1ba17]
+class C_0000000390--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="73.6094" id="C_0000000390" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="769" y="8"/><ellipse cx="833.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M833.3594,19.3438 L832.2031,24.4219 L834.5313,24.4219 L833.3594,19.3438 Z M831.875,17.1094 L834.8594,17.1094 L838.2188,29.5 L835.7656,29.5 L835,26.4375 L831.7188,26.4375 L830.9688,29.5 L828.5313,29.5 L831.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="853.75" y="28.1543">ProductA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="48" y2="48"/><ellipse cx="780" cy="59" 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" text-decoration="underline" textLength="102" x="789" y="62.2104">~ProductA() : void</text><ellipse cx="780" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="789" y="75.0151">sell(int price) const = 0 : bool</text><!--MD5=[3abbd265372d0193dbec2892fb674858]
+class C_0000000392--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="60.8047" id="C_0000000392" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="212" y="148.5"/><ellipse cx="260.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M263.7188,170.1406 Q263.1406,170.4375 262.5,170.5781 Q261.8594,170.7344 261.1563,170.7344 Q258.6563,170.7344 257.3281,169.0938 Q256.0156,167.4375 256.0156,164.3125 Q256.0156,161.1875 257.3281,159.5313 Q258.6563,157.875 261.1563,157.875 Q261.8594,157.875 262.5,158.0313 Q263.1563,158.1875 263.7188,158.4844 L263.7188,161.2031 Q263.0938,160.625 262.5,160.3594 Q261.9063,160.0781 261.2813,160.0781 Q259.9375,160.0781 259.25,161.1563 Q258.5625,162.2188 258.5625,164.3125 Q258.5625,166.4063 259.25,167.4844 Q259.9375,168.5469 261.2813,168.5469 Q261.9063,168.5469 262.5,168.2813 Q263.0938,168 263.7188,167.4219 L263.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="281.25" y="168.6543">ProductA1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="188.5" y2="188.5"/><ellipse cx="223" cy="199.5" 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="145" x="232" y="202.7104">sell(int price) const : bool</text><!--MD5=[9501810d1e8212874eaa0414f9b93a3f]
+class C_0000000394--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="60.8047" id="C_0000000394" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="962" y="148.5"/><ellipse cx="1010.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1013.7188,170.1406 Q1013.1406,170.4375 1012.5,170.5781 Q1011.8594,170.7344 1011.1563,170.7344 Q1008.6563,170.7344 1007.3281,169.0938 Q1006.0156,167.4375 1006.0156,164.3125 Q1006.0156,161.1875 1007.3281,159.5313 Q1008.6563,157.875 1011.1563,157.875 Q1011.8594,157.875 1012.5,158.0313 Q1013.1563,158.1875 1013.7188,158.4844 L1013.7188,161.2031 Q1013.0938,160.625 1012.5,160.3594 Q1011.9063,160.0781 1011.2813,160.0781 Q1009.9375,160.0781 1009.25,161.1563 Q1008.5625,162.2188 1008.5625,164.3125 Q1008.5625,166.4063 1009.25,167.4844 Q1009.9375,168.5469 1011.2813,168.5469 Q1011.9063,168.5469 1012.5,168.2813 Q1013.0938,168 1013.7188,167.4219 L1013.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="1031.25" y="168.6543">ProductA2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="188.5" y2="188.5"/><ellipse cx="973" cy="199.5" 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="145" x="982" y="202.7104">sell(int price) const : bool</text><!--MD5=[2e0c44a3fc196c104c70b46f63dafaa9]
+class C_0000000396--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="73.6094" id="C_0000000396" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="357" y="8"/><ellipse cx="422.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M422.3594,19.3438 L421.2031,24.4219 L423.5313,24.4219 L422.3594,19.3438 Z M420.875,17.1094 L423.8594,17.1094 L427.2188,29.5 L424.7656,29.5 L424,26.4375 L420.7188,26.4375 L419.9688,29.5 L417.5313,29.5 L420.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="442.75" y="28.1543">ProductB</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="48" y2="48"/><ellipse cx="368" cy="59" 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" text-decoration="underline" textLength="103" x="377" y="62.2104">~ProductB() : void</text><ellipse cx="368" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="377" y="75.0151">buy(int price) const = 0 : bool</text><!--MD5=[39bc368e8a964c1f9153552fd6e4347b]
+class C_0000000398--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="60.8047" id="C_0000000398" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="6" y="148.5"/><ellipse cx="54.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M57.7188,170.1406 Q57.1406,170.4375 56.5,170.5781 Q55.8594,170.7344 55.1563,170.7344 Q52.6563,170.7344 51.3281,169.0938 Q50.0156,167.4375 50.0156,164.3125 Q50.0156,161.1875 51.3281,159.5313 Q52.6563,157.875 55.1563,157.875 Q55.8594,157.875 56.5,158.0313 Q57.1563,158.1875 57.7188,158.4844 L57.7188,161.2031 Q57.0938,160.625 56.5,160.3594 Q55.9063,160.0781 55.2813,160.0781 Q53.9375,160.0781 53.25,161.1563 Q52.5625,162.2188 52.5625,164.3125 Q52.5625,166.4063 53.25,167.4844 Q53.9375,168.5469 55.2813,168.5469 Q55.9063,168.5469 56.5,168.2813 Q57.0938,168 57.7188,167.4219 L57.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="75.25" y="168.6543">ProductB1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="188.5" y2="188.5"/><ellipse cx="17" cy="199.5" 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="145" x="26" y="202.7104">buy(int price) const : bool</text><!--MD5=[fb527ae0c260bc2061442e7ad478bc6d]
+class C_0000000400--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="60.8047" id="C_0000000400" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="756" y="148.5"/><ellipse cx="804.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M807.7188,170.1406 Q807.1406,170.4375 806.5,170.5781 Q805.8594,170.7344 805.1563,170.7344 Q802.6563,170.7344 801.3281,169.0938 Q800.0156,167.4375 800.0156,164.3125 Q800.0156,161.1875 801.3281,159.5313 Q802.6563,157.875 805.1563,157.875 Q805.8594,157.875 806.5,158.0313 Q807.1563,158.1875 807.7188,158.4844 L807.7188,161.2031 Q807.0938,160.625 806.5,160.3594 Q805.9063,160.0781 805.2813,160.0781 Q803.9375,160.0781 803.25,161.1563 Q802.5625,162.2188 802.5625,164.3125 Q802.5625,166.4063 803.25,167.4844 Q803.9375,168.5469 805.2813,168.5469 Q805.9063,168.5469 806.5,168.2813 Q807.0938,168 807.7188,167.4219 L807.7188,170.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="825.25" y="168.6543">ProductB2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="180.5" y2="180.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="188.5" y2="188.5"/><ellipse cx="767" cy="199.5" 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="145" x="776" y="202.7104">buy(int price) const : bool</text><!--MD5=[71b0b69fbc8af3cbb5ae79682285c652]
+class C_0000000402--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="73.6094" id="C_0000000402" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="418.5" y="142"/><ellipse cx="515.75" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M515.8594,153.3438 L514.7031,158.4219 L517.0313,158.4219 L515.8594,153.3438 Z M514.375,151.1094 L517.3594,151.1094 L520.7188,163.5 L518.2656,163.5 L517.5,160.4375 L514.2188,160.4375 L513.4688,163.5 L511.0313,163.5 L514.375,151.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="536.25" y="162.1543">AbstractFactory</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="174" y2="174"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="182" y2="182"/><ellipse cx="429.5" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="196.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="429.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="209.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[4af1c8861dd418258ce78d28f4be7a95]
+class C_0000000404--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="73.6094" id="C_0000000404" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="157.5" y="276"/><ellipse cx="266.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M269.2188,297.6406 Q268.6406,297.9375 268,298.0781 Q267.3594,298.2344 266.6563,298.2344 Q264.1563,298.2344 262.8281,296.5938 Q261.5156,294.9375 261.5156,291.8125 Q261.5156,288.6875 262.8281,287.0313 Q264.1563,285.375 266.6563,285.375 Q267.3594,285.375 268,285.5313 Q268.6563,285.6875 269.2188,285.9844 L269.2188,288.7031 Q268.5938,288.125 268,287.8594 Q267.4063,287.5781 266.7813,287.5781 Q265.4375,287.5781 264.75,288.6563 Q264.0625,289.7188 264.0625,291.8125 Q264.0625,293.9063 264.75,294.9844 Q265.4375,296.0469 266.7813,296.0469 Q267.4063,296.0469 268,295.7813 Q268.5938,295.5 269.2188,294.9219 L269.2188,297.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="286.75" y="296.1543">Factory1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="308" y2="308"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="316" y2="316"/><ellipse cx="168.5" cy="327" 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="253" x="177.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="168.5" cy="339.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="254" x="177.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[fd67ff2f70b0ee603a1dc6c048b70679]
+class C_0000000406--><rect fill="#FEFECE" filter="url(#fwrspm01dofr8)" height="73.6094" id="C_0000000406" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="701.5" y="276"/><ellipse cx="810.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M813.2188,297.6406 Q812.6406,297.9375 812,298.0781 Q811.3594,298.2344 810.6563,298.2344 Q808.1563,298.2344 806.8281,296.5938 Q805.5156,294.9375 805.5156,291.8125 Q805.5156,288.6875 806.8281,287.0313 Q808.1563,285.375 810.6563,285.375 Q811.3594,285.375 812,285.5313 Q812.6563,285.6875 813.2188,285.9844 L813.2188,288.7031 Q812.5938,288.125 812,287.8594 Q811.4063,287.5781 810.7813,287.5781 Q809.4375,287.5781 808.75,288.6563 Q808.0625,289.7188 808.0625,291.8125 Q808.0625,293.9063 808.75,294.9844 Q809.4375,296.0469 810.7813,296.0469 Q811.4063,296.0469 812,295.7813 Q812.5938,295.5 813.2188,294.9219 L813.2188,297.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="830.75" y="296.1543">Factory2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="308" y2="308"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="316" y2="316"/><ellipse cx="712.5" cy="327" 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="253" x="721.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text><ellipse cx="712.5" cy="339.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="254" x="721.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text><!--MD5=[b8d1df6c838e50ce0e7c59e3bdbcfad4]
+reverse link C_0000000390 to C_0000000392--><path d="M748.87,65.81 C654.43,82.89 518.37,109.83 401.5,142 C394.41,143.95 387.1,146.13 379.79,148.43 " fill="none" id="C_0000000390&lt;-C_0000000392" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="747.74,58.9,768.66,62.27,750.21,72.68,747.74,58.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[86f31365bcfe5504d432ffe92744fda8]
+reverse link C_0000000390 to C_0000000394--><path d="M931.67,93.99 C956.78,112.2 984.63,132.4 1006.73,148.43 " fill="none" id="C_0000000390&lt;-C_0000000394" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="927.31,99.48,915.23,82.07,935.53,88.15,927.31,99.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3817ac753ae208087099af99ff7c68ac]
+reverse link C_0000000396 to C_0000000398--><path d="M337.74,88.46 C283.96,108.02 221.44,130.75 172.86,148.41 " fill="none" id="C_0000000396&lt;-C_0000000398" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="335.56,81.8,356.75,81.55,340.34,94.96,335.56,81.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7fbbfcc55a6074ae205f2b5e13da7673]
+reverse link C_0000000396 to C_0000000400--><path d="M571.34,85.2 C622.67,102.49 683.62,123.13 738.5,142 C744.59,144.09 750.88,146.27 757.21,148.46 " fill="none" id="C_0000000396&lt;-C_0000000400" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="568.9,91.76,552.18,78.74,573.37,78.49,568.9,91.76" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f5195f5e8195a0eb3e045124f066ba27]
+reverse link C_0000000402 to C_0000000404--><path d="M477.11,224.83 C442.76,241.51 404.26,260.19 371.74,275.97 " fill="none" id="C_0000000402&lt;-C_0000000404" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="474.13,218.5,495.17,216.07,480.24,231.1,474.13,218.5" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[31871d237fe4d446057869b6179a7a44]
+reverse link C_0000000402 to C_0000000406--><path d="M661.89,224.83 C696.24,241.51 734.74,260.19 767.26,275.97 " fill="none" id="C_0000000402&lt;-C_0000000406" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="658.76,231.1,643.83,216.07,664.87,218.5,658.76,231.1" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dc9bfe14c0fece2f30a0a06e0f0d1c58]
+reverse link C_0000000392 to C_0000000404--><path d="M297.5,214.81 C297.5,233.64 297.5,256.87 297.5,275.89 " fill="none" id="C_0000000392&lt;-C_0000000404" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="297.5,209.62,293.5,218.62,297.5,214.62,301.5,218.62,297.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e44f0c7c415acd2d52fd7cb9d8668fd3]
+reverse link C_0000000398 to C_0000000404--><path d="M142.1,212.42 C172.1,231.65 210.19,256.05 241.15,275.89 " fill="none" id="C_0000000398&lt;-C_0000000404" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="137.73,209.62,143.1574,217.8385,141.9424,212.3136,147.4672,211.0986,137.73,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f62a39457b2acefd619ceaaf44a8a7f2]
+reverse link C_0000000394 to C_0000000406--><path d="M996.9,212.42 C966.9,231.65 928.81,256.05 897.85,275.89 " fill="none" id="C_0000000394&lt;-C_0000000406" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1001.27,209.62,991.5328,211.0986,997.0576,212.3136,995.8426,217.8385,1001.27,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[221ffbcd12f8eb07780d7e658afda200]
+reverse link C_0000000400 to C_0000000406--><path d="M841.5,214.81 C841.5,233.64 841.5,256.87 841.5,275.89 " fill="none" id="C_0000000400&lt;-C_0000000406" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="841.5,209.62,837.5,218.62,841.5,214.62,845.5,218.62,841.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[357877b521d6ff1c4f3c98d94e4e9780]
 @startuml
-abstract "ProductA" as C_0000000339
-abstract C_0000000339 {
+
+abstract "ProductA" as C_0000000390
+abstract C_0000000390 {
 {static} +~ProductA() : void
 {abstract} +sell(int price) const = 0 : bool
 }
 
-class "ProductA1" as C_0000000341
-class C_0000000341 {
+class "ProductA1" as C_0000000392
+class C_0000000392 {
 +sell(int price) const : bool
 }
-C_0000000339 <|- - C_0000000341
 
-class "ProductA2" as C_0000000343
-class C_0000000343 {
+class "ProductA2" as C_0000000394
+class C_0000000394 {
 +sell(int price) const : bool
 }
-C_0000000339 <|- - C_0000000343
 
-abstract "ProductB" as C_0000000345
-abstract C_0000000345 {
+abstract "ProductB" as C_0000000396
+abstract C_0000000396 {
 {static} +~ProductB() : void
 {abstract} +buy(int price) const = 0 : bool
 }
 
-class "ProductB1" as C_0000000347
-class C_0000000347 {
+class "ProductB1" as C_0000000398
+class C_0000000398 {
 +buy(int price) const : bool
 }
-C_0000000345 <|- - C_0000000347
 
-class "ProductB2" as C_0000000349
-class C_0000000349 {
+class "ProductB2" as C_0000000400
+class C_0000000400 {
 +buy(int price) const : bool
 }
-C_0000000345 <|- - C_0000000349
 
-abstract "AbstractFactory" as C_0000000351
-abstract C_0000000351 {
+abstract "AbstractFactory" as C_0000000402
+abstract C_0000000402 {
 {abstract} +make_a() const = 0 : std::unique_ptr<ProductA>
 {abstract} +make_b() const = 0 : std::unique_ptr<ProductB>
 }
 
-class "Factory1" as C_0000000353
-class C_0000000353 {
+class "Factory1" as C_0000000404
+class C_0000000404 {
 +make_a() const : std::unique_ptr<ProductA>
 +make_b() const : std::unique_ptr<ProductB>
 }
-C_0000000351 <|- - C_0000000353
 
-class "Factory2" as C_0000000355
-class C_0000000355 {
+class "Factory2" as C_0000000406
+class C_0000000406 {
 +make_a() const : std::unique_ptr<ProductA>
 +make_b() const : std::unique_ptr<ProductB>
 }
-C_0000000351 <|- - C_0000000355
 
-C_0000000341 <.. C_0000000353
-C_0000000347 <.. C_0000000353
-C_0000000343 <.. C_0000000355
-C_0000000349 <.. C_0000000355
+C_0000000390 <|- - C_0000000392
+C_0000000390 <|- - C_0000000394
+C_0000000396 <|- - C_0000000398
+C_0000000396 <|- - C_0000000400
+C_0000000402 <|- - C_0000000404
+C_0000000402 <|- - C_0000000406
+C_0000000392 <.. C_0000000404
+C_0000000398 <.. C_0000000404
+C_0000000394 <.. C_0000000406
+C_0000000400 <.. C_0000000406
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 1f629d47..0400be70 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,85 +1,86 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:976px;height:493px;" version="1.1" viewBox="0 0 976 493" width="976px" zoomAndPan="magnify"><defs><filter height="300%" id="f1t2ae8s8e3m0g" 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></defs><g><!--MD5=[c0dc6a189f413135b54920771406b18d]
-class C_0000000357--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="86.4141" id="C_0000000357" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="363" y="142"/><ellipse cx="462.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M462.3594,153.3438 L461.2031,158.4219 L463.5313,158.4219 L462.3594,153.3438 Z M460.875,151.1094 L463.8594,151.1094 L467.2188,163.5 L464.7656,163.5 L464,160.4375 L460.7188,160.4375 L459.9688,163.5 L457.5313,163.5 L460.875,151.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="482.75" y="162.1543">Visitor</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="607" y1="174" y2="174"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="607" y1="182" y2="182"/><ellipse cx="374" cy="193" 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" text-decoration="underline" textLength="88" x="383" y="196.2104">~Visitor() : void</text><ellipse cx="374" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="219" x="383" y="209.0151">visit_A(A const&amp; item) const = 0 : void</text><ellipse cx="374" cy="218.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="219" x="383" y="221.8198">visit_B(B const&amp; item) const = 0 : void</text><!--MD5=[a0c25ad09a7daf2ca9d345598ef00c3c]
-class C_0000000359--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="73.6094" id="C_0000000359" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="116" y="288"/><ellipse cx="199.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M202.7188,309.6406 Q202.1406,309.9375 201.5,310.0781 Q200.8594,310.2344 200.1563,310.2344 Q197.6563,310.2344 196.3281,308.5938 Q195.0156,306.9375 195.0156,303.8125 Q195.0156,300.6875 196.3281,299.0313 Q197.6563,297.375 200.1563,297.375 Q200.8594,297.375 201.5,297.5313 Q202.1563,297.6875 202.7188,297.9844 L202.7188,300.7031 Q202.0938,300.125 201.5,299.8594 Q200.9063,299.5781 200.2813,299.5781 Q198.9375,299.5781 198.25,300.6563 Q197.5625,301.7188 197.5625,303.8125 Q197.5625,305.9063 198.25,306.9844 Q198.9375,308.0469 200.2813,308.0469 Q200.9063,308.0469 201.5,307.7813 Q202.0938,307.5 202.7188,306.9219 L202.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="220.25" y="308.1543">Visitor1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="338" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="338" y1="328" y2="328"/><ellipse cx="127" cy="339" 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="195" x="136" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="127" cy="351.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="197" x="136" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[16fb7284204ee47cfea8f10c29696673]
-class C_0000000361--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="73.6094" id="C_0000000361" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="374" y="288"/><ellipse cx="457.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M460.7188,309.6406 Q460.1406,309.9375 459.5,310.0781 Q458.8594,310.2344 458.1563,310.2344 Q455.6563,310.2344 454.3281,308.5938 Q453.0156,306.9375 453.0156,303.8125 Q453.0156,300.6875 454.3281,299.0313 Q455.6563,297.375 458.1563,297.375 Q458.8594,297.375 459.5,297.5313 Q460.1563,297.6875 460.7188,297.9844 L460.7188,300.7031 Q460.0938,300.125 459.5,299.8594 Q458.9063,299.5781 458.2813,299.5781 Q456.9375,299.5781 456.25,300.6563 Q455.5625,301.7188 455.5625,303.8125 Q455.5625,305.9063 456.25,306.9844 Q456.9375,308.0469 458.2813,308.0469 Q458.9063,308.0469 459.5,307.7813 Q460.0938,307.5 460.7188,306.9219 L460.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="478.25" y="308.1543">Visitor2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="596" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="596" y1="328" y2="328"/><ellipse cx="385" cy="339" 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="195" x="394" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="385" cy="351.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="197" x="394" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[b5b756fa088812d7bc586bc2377b4756]
-class C_0000000363--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="73.6094" id="C_0000000363" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="632" y="288"/><ellipse cx="715.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M718.7188,309.6406 Q718.1406,309.9375 717.5,310.0781 Q716.8594,310.2344 716.1563,310.2344 Q713.6563,310.2344 712.3281,308.5938 Q711.0156,306.9375 711.0156,303.8125 Q711.0156,300.6875 712.3281,299.0313 Q713.6563,297.375 716.1563,297.375 Q716.8594,297.375 717.5,297.5313 Q718.1563,297.6875 718.7188,297.9844 L718.7188,300.7031 Q718.0938,300.125 717.5,299.8594 Q716.9063,299.5781 716.2813,299.5781 Q714.9375,299.5781 714.25,300.6563 Q713.5625,301.7188 713.5625,303.8125 Q713.5625,305.9063 714.25,306.9844 Q714.9375,308.0469 716.2813,308.0469 Q716.9063,308.0469 717.5,307.7813 Q718.0938,307.5 718.7188,306.9219 L718.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="736.25" y="308.1543">Visitor3</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="633" x2="854" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="633" x2="854" y1="328" y2="328"/><ellipse cx="643" cy="339" 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="195" x="652" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="643" cy="351.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="197" x="652" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[938060dfbe60ffc448c8cfa57b97cca9]
-class C_0000000365--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="73.6094" id="C_0000000365" style="stroke: #A80036; stroke-width: 1.5;" width="283" x="344" y="8"/><ellipse cx="467.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M467.3594,19.3438 L466.2031,24.4219 L468.5313,24.4219 L467.3594,19.3438 Z M465.875,17.1094 L468.8594,17.1094 L472.2188,29.5 L469.7656,29.5 L469,26.4375 L465.7188,26.4375 L464.9688,29.5 L462.5313,29.5 L465.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="487.75" y="28.1543">Item</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="345" x2="626" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="345" x2="626" y1="48" y2="48"/><ellipse cx="355" cy="59" 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" text-decoration="underline" textLength="77" x="364" y="62.2104">~Item() : void</text><ellipse cx="355" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="257" x="364" y="75.0151">accept(Visitor const&amp; visitor) const = 0 : void</text><!--MD5=[c9b7a562cdd3f76b0c28e3579008c797]
-class C_0000000367--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="60.8047" id="C_0000000367" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="6" y="422"/><ellipse cx="128.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M131.2188,443.6406 Q130.6406,443.9375 130,444.0781 Q129.3594,444.2344 128.6563,444.2344 Q126.1563,444.2344 124.8281,442.5938 Q123.5156,440.9375 123.5156,437.8125 Q123.5156,434.6875 124.8281,433.0313 Q126.1563,431.375 128.6563,431.375 Q129.3594,431.375 130,431.5313 Q130.6563,431.6875 131.2188,431.9844 L131.2188,434.7031 Q130.5938,434.125 130,433.8594 Q129.4063,433.5781 128.7813,433.5781 Q127.4375,433.5781 126.75,434.6563 Q126.0625,435.7188 126.0625,437.8125 Q126.0625,439.9063 126.75,440.9844 Q127.4375,442.0469 128.7813,442.0469 Q129.4063,442.0469 130,441.7813 Q130.5938,441.5 131.2188,440.9219 L131.2188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.75" y="442.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="266" y1="454" y2="454"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="266" y1="462" y2="462"/><ellipse cx="17" cy="473" 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="235" x="26" y="476.2104">accept(Visitor const&amp; visitor) const : void</text><!--MD5=[8b5ec23947b7ff74bee1b43c1eafdb07]
-class C_0000000369--><rect fill="#FEFECE" filter="url(#f1t2ae8s8e3m0g)" height="60.8047" id="C_0000000369" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="704" y="422"/><ellipse cx="826.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M829.2188,443.6406 Q828.6406,443.9375 828,444.0781 Q827.3594,444.2344 826.6563,444.2344 Q824.1563,444.2344 822.8281,442.5938 Q821.5156,440.9375 821.5156,437.8125 Q821.5156,434.6875 822.8281,433.0313 Q824.1563,431.375 826.6563,431.375 Q827.3594,431.375 828,431.5313 Q828.6563,431.6875 829.2188,431.9844 L829.2188,434.7031 Q828.5938,434.125 828,433.8594 Q827.4063,433.5781 826.7813,433.5781 Q825.4375,433.5781 824.75,434.6563 Q824.0625,435.7188 824.0625,437.8125 Q824.0625,439.9063 824.75,440.9844 Q825.4375,442.0469 826.7813,442.0469 Q827.4063,442.0469 828,441.7813 Q828.5938,441.5 829.2188,440.9219 L829.2188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="846.75" y="442.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="964" y1="454" y2="454"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="964" y1="462" y2="462"/><ellipse cx="715" cy="473" 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="235" x="724" y="476.2104">accept(Visitor const&amp; visitor) const : void</text><!--MD5=[57c657abcd6ee5e7efcbcefa08404859]
-reverse link C_0000000357 to C_0000000359--><path d="M388.68,237.79 C357.47,254.48 323.56,272.62 294.94,287.93 " fill="none" id="C_0000000357&lt;-C_0000000359" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="385.75,231.41,406.69,228.15,392.36,243.76,385.75,231.41" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c5d9c20a1b4805975b7514b2d52670ec]
-reverse link C_0000000357 to C_0000000361--><path d="M485.5,248.62 C485.5,262 485.5,275.71 485.5,287.7 " fill="none" id="C_0000000357&lt;-C_0000000361" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="478.5,248.15,485.5,228.15,492.5,248.15,478.5,248.15" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e48fbdfdae92a36a0207a2b8591f4184]
-reverse link C_0000000357 to C_0000000363--><path d="M582.32,237.79 C613.53,254.48 647.44,272.62 676.06,287.93 " fill="none" id="C_0000000357&lt;-C_0000000363" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="578.64,243.76,564.31,228.15,585.25,231.41,578.64,243.76" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b44934ed6031fb69bba505daae3eb201]
-reverse link C_0000000365 to C_0000000367--><path d="M342.91,89.23 C249.3,125.88 134.09,188.64 77.5,288 C52.56,331.79 85.27,388.03 111.02,421.83 " fill="none" id="C_0000000365&lt;-C_0000000367" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="340.44,82.69,361.62,82.14,345.4,95.78,340.44,82.69" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7c5b9109480d4e751aa28dc6d1a2138f]
-reverse link C_0000000365 to C_0000000369--><path d="M643.55,88.73 C742.32,124.51 861.74,186.48 921.5,288 C938.18,316.34 933.87,331.53 921.5,362 C911.96,385.49 892.97,406.2 875.16,421.77 " fill="none" id="C_0000000365&lt;-C_0000000369" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="640.97,95.24,624.41,82.02,645.6,82.03,640.97,95.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2edd3383abbc4b2b54c277d8c5161be3]
-link C_0000000357 to C_0000000367--><path d="M362.77,199.95 C256.56,215.45 115.24,244.21 81.5,288 C52.44,325.71 75.94,381.87 101.17,417.58 " fill="none" id="C_0000000357-&gt;C_0000000367" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="104.26,421.83,102.2135,412.1961,101.3242,417.7826,95.7377,416.8933,104.26,421.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[95fe8c2fd74de23d3368b840188f8c8f]
-link C_0000000367 to C_0000000357--><path d="M129.01,421.83 C112.94,386.47 86.26,327.24 116.5,288 C146.76,248.73 263.53,221.55 357.84,205.18 " fill="none" id="C_0000000367-&gt;C_0000000357" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="362.88,204.31,353.3345,201.8843,357.9515,205.1528,354.6831,209.7699,362.88,204.31" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[415ef045a1e87bffaae663cf2b2d6aaf]
-link C_0000000357 to C_0000000369--><path d="M608.44,204.23 C703.85,220.49 824.65,247.96 855.5,288 C884.44,325.56 861.25,381.41 844.86,417.14 " fill="none" id="C_0000000357-&gt;C_0000000369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="842.7,421.83,850.1072,415.339,844.798,417.2915,842.8456,411.9822,842.7,421.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8137122c917909752a5a8b45ab2d66c3]
-link C_0000000369 to C_0000000357--><path d="M867.45,421.83 C894.06,386.47 920.74,327.24 890.5,288 C857.21,244.79 719.18,216.22 613.26,200.58 " fill="none" id="C_0000000369-&gt;C_0000000357" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="608.24,199.84,616.5754,205.0861,613.1886,200.5551,617.7196,197.1683,608.24,199.84" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f8c1ccfb299490dea4612836c4d6171f]
-link C_0000000359 to C_0000000367--><path d="M201.18,362.3 C188.6,379.65 173.62,400.31 161.25,417.37 " fill="none" id="C_0000000359-&gt;C_0000000367" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="158.16,421.62,166.6709,416.6637,161.0864,417.5659,160.1842,411.9814,158.16,421.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7ec27212c6f841078ddcfea083a07ec7]
-link C_0000000359 to C_0000000369--><path d="M339.22,357.82 C345.05,359.28 350.84,360.68 356.5,362 C471.12,388.67 602.62,412.83 698.65,429.31 " fill="none" id="C_0000000359-&gt;C_0000000369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="703.77,430.18,695.5731,424.7201,698.8415,429.3372,694.2245,432.6057,703.77,430.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[11646803207181196493dcf8897926f3]
-link C_0000000361 to C_0000000367--><path d="M385.02,362.13 C333.91,380.51 272.4,402.63 223.36,420.26 " fill="none" id="C_0000000361-&gt;C_0000000367" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="218.66,421.96,228.482,422.6867,223.3664,420.272,225.7812,415.1564,218.66,421.96" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ff5ea8b44b7ffce52c17fd4c7f044498]
-link C_0000000361 to C_0000000369--><path d="M585.98,362.13 C637.09,380.51 698.6,402.63 747.64,420.26 " fill="none" id="C_0000000361-&gt;C_0000000369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="752.34,421.96,745.2188,415.1564,747.6336,420.272,742.518,422.6867,752.34,421.96" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[98b12962bbda806b200d44d4efb6b104]
-link C_0000000363 to C_0000000367--><path d="M631.78,357.82 C625.95,359.28 620.16,360.68 614.5,362 C499.88,388.67 368.38,412.83 272.35,429.31 " fill="none" id="C_0000000363-&gt;C_0000000367" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="267.23,430.18,276.7755,432.6057,272.1585,429.3372,275.4269,424.7201,267.23,430.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[465895ac9ce364c9dcd2b9790c05ce0f]
-link C_0000000363 to C_0000000369--><path d="M769.82,362.3 C782.4,379.65 797.38,400.31 809.75,417.37 " fill="none" id="C_0000000363-&gt;C_0000000369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="812.84,421.62,810.8158,411.9814,809.9136,417.5659,804.3291,416.6637,812.84,421.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a2c5f4809e33082a550b44846d743ebf]
-link C_0000000365 to C_0000000357--><path d="M485.5,82.26 C485.5,98.76 485.5,118.51 485.5,136.2 " fill="none" id="C_0000000365-&gt;C_0000000357" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="485.5,141.62,489.5,132.62,485.5,136.62,481.5,132.62,485.5,141.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[13f77eb6657fcc2f433d839307c20c3b]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:976px;height:493px;" version="1.1" viewBox="0 0 976 493" width="976px" zoomAndPan="magnify"><defs><filter height="300%" id="fle8maheqlfgc" 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></defs><g><!--MD5=[2823dc17016fda273f8cdad50f4b295e]
+class C_0000000410--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="86.4141" id="C_0000000410" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="363" y="142"/><ellipse cx="462.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M462.3594,153.3438 L461.2031,158.4219 L463.5313,158.4219 L462.3594,153.3438 Z M460.875,151.1094 L463.8594,151.1094 L467.2188,163.5 L464.7656,163.5 L464,160.4375 L460.7188,160.4375 L459.9688,163.5 L457.5313,163.5 L460.875,151.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="482.75" y="162.1543">Visitor</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="607" y1="174" y2="174"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="607" y1="182" y2="182"/><ellipse cx="374" cy="193" 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" text-decoration="underline" textLength="88" x="383" y="196.2104">~Visitor() : void</text><ellipse cx="374" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="219" x="383" y="209.0151">visit_A(A const&amp; item) const = 0 : void</text><ellipse cx="374" cy="218.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="219" x="383" y="221.8198">visit_B(B const&amp; item) const = 0 : void</text><!--MD5=[f92fbe041ce671ca1086bfd81c2e4d0f]
+class C_0000000412--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="73.6094" id="C_0000000412" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="116" y="288"/><ellipse cx="199.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M202.7188,309.6406 Q202.1406,309.9375 201.5,310.0781 Q200.8594,310.2344 200.1563,310.2344 Q197.6563,310.2344 196.3281,308.5938 Q195.0156,306.9375 195.0156,303.8125 Q195.0156,300.6875 196.3281,299.0313 Q197.6563,297.375 200.1563,297.375 Q200.8594,297.375 201.5,297.5313 Q202.1563,297.6875 202.7188,297.9844 L202.7188,300.7031 Q202.0938,300.125 201.5,299.8594 Q200.9063,299.5781 200.2813,299.5781 Q198.9375,299.5781 198.25,300.6563 Q197.5625,301.7188 197.5625,303.8125 Q197.5625,305.9063 198.25,306.9844 Q198.9375,308.0469 200.2813,308.0469 Q200.9063,308.0469 201.5,307.7813 Q202.0938,307.5 202.7188,306.9219 L202.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="220.25" y="308.1543">Visitor1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="338" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="338" y1="328" y2="328"/><ellipse cx="127" cy="339" 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="195" x="136" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="127" cy="351.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="197" x="136" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[0534e1fd06b5bfcee2f7c64217bdf5cd]
+class C_0000000414--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="73.6094" id="C_0000000414" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="374" y="288"/><ellipse cx="457.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M460.7188,309.6406 Q460.1406,309.9375 459.5,310.0781 Q458.8594,310.2344 458.1563,310.2344 Q455.6563,310.2344 454.3281,308.5938 Q453.0156,306.9375 453.0156,303.8125 Q453.0156,300.6875 454.3281,299.0313 Q455.6563,297.375 458.1563,297.375 Q458.8594,297.375 459.5,297.5313 Q460.1563,297.6875 460.7188,297.9844 L460.7188,300.7031 Q460.0938,300.125 459.5,299.8594 Q458.9063,299.5781 458.2813,299.5781 Q456.9375,299.5781 456.25,300.6563 Q455.5625,301.7188 455.5625,303.8125 Q455.5625,305.9063 456.25,306.9844 Q456.9375,308.0469 458.2813,308.0469 Q458.9063,308.0469 459.5,307.7813 Q460.0938,307.5 460.7188,306.9219 L460.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="478.25" y="308.1543">Visitor2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="596" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="596" y1="328" y2="328"/><ellipse cx="385" cy="339" 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="195" x="394" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="385" cy="351.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="197" x="394" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[c8a13d88dd96613394bfce53a19d83fe]
+class C_0000000416--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="73.6094" id="C_0000000416" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="632" y="288"/><ellipse cx="715.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M718.7188,309.6406 Q718.1406,309.9375 717.5,310.0781 Q716.8594,310.2344 716.1563,310.2344 Q713.6563,310.2344 712.3281,308.5938 Q711.0156,306.9375 711.0156,303.8125 Q711.0156,300.6875 712.3281,299.0313 Q713.6563,297.375 716.1563,297.375 Q716.8594,297.375 717.5,297.5313 Q718.1563,297.6875 718.7188,297.9844 L718.7188,300.7031 Q718.0938,300.125 717.5,299.8594 Q716.9063,299.5781 716.2813,299.5781 Q714.9375,299.5781 714.25,300.6563 Q713.5625,301.7188 713.5625,303.8125 Q713.5625,305.9063 714.25,306.9844 Q714.9375,308.0469 716.2813,308.0469 Q716.9063,308.0469 717.5,307.7813 Q718.0938,307.5 718.7188,306.9219 L718.7188,309.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="736.25" y="308.1543">Visitor3</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="633" x2="854" y1="320" y2="320"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="633" x2="854" y1="328" y2="328"/><ellipse cx="643" cy="339" 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="195" x="652" y="342.2104">visit_A(A const&amp; item) const : void</text><ellipse cx="643" cy="351.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="197" x="652" y="355.0151">visit_B(B const&amp; item) const : void</text><!--MD5=[6906ba058e48709e5d5c03346b68f73c]
+class C_0000000418--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="73.6094" id="C_0000000418" style="stroke: #A80036; stroke-width: 1.5;" width="283" x="344" y="8"/><ellipse cx="467.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M467.3594,19.3438 L466.2031,24.4219 L468.5313,24.4219 L467.3594,19.3438 Z M465.875,17.1094 L468.8594,17.1094 L472.2188,29.5 L469.7656,29.5 L469,26.4375 L465.7188,26.4375 L464.9688,29.5 L462.5313,29.5 L465.875,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="487.75" y="28.1543">Item</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="345" x2="626" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="345" x2="626" y1="48" y2="48"/><ellipse cx="355" cy="59" 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" text-decoration="underline" textLength="77" x="364" y="62.2104">~Item() : void</text><ellipse cx="355" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="257" x="364" y="75.0151">accept(Visitor const&amp; visitor) const = 0 : void</text><!--MD5=[a8dcd5fcd53b285eeb59775da3e59594]
+class C_0000000420--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="60.8047" id="C_0000000420" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="6" y="422"/><ellipse cx="128.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M131.2188,443.6406 Q130.6406,443.9375 130,444.0781 Q129.3594,444.2344 128.6563,444.2344 Q126.1563,444.2344 124.8281,442.5938 Q123.5156,440.9375 123.5156,437.8125 Q123.5156,434.6875 124.8281,433.0313 Q126.1563,431.375 128.6563,431.375 Q129.3594,431.375 130,431.5313 Q130.6563,431.6875 131.2188,431.9844 L131.2188,434.7031 Q130.5938,434.125 130,433.8594 Q129.4063,433.5781 128.7813,433.5781 Q127.4375,433.5781 126.75,434.6563 Q126.0625,435.7188 126.0625,437.8125 Q126.0625,439.9063 126.75,440.9844 Q127.4375,442.0469 128.7813,442.0469 Q129.4063,442.0469 130,441.7813 Q130.5938,441.5 131.2188,440.9219 L131.2188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.75" y="442.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="266" y1="454" y2="454"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="266" y1="462" y2="462"/><ellipse cx="17" cy="473" 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="235" x="26" y="476.2104">accept(Visitor const&amp; visitor) const : void</text><!--MD5=[e650dcc2bd136c9503e3a4973da1af4f]
+class C_0000000422--><rect fill="#FEFECE" filter="url(#fle8maheqlfgc)" height="60.8047" id="C_0000000422" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="704" y="422"/><ellipse cx="826.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M829.2188,443.6406 Q828.6406,443.9375 828,444.0781 Q827.3594,444.2344 826.6563,444.2344 Q824.1563,444.2344 822.8281,442.5938 Q821.5156,440.9375 821.5156,437.8125 Q821.5156,434.6875 822.8281,433.0313 Q824.1563,431.375 826.6563,431.375 Q827.3594,431.375 828,431.5313 Q828.6563,431.6875 829.2188,431.9844 L829.2188,434.7031 Q828.5938,434.125 828,433.8594 Q827.4063,433.5781 826.7813,433.5781 Q825.4375,433.5781 824.75,434.6563 Q824.0625,435.7188 824.0625,437.8125 Q824.0625,439.9063 824.75,440.9844 Q825.4375,442.0469 826.7813,442.0469 Q827.4063,442.0469 828,441.7813 Q828.5938,441.5 829.2188,440.9219 L829.2188,443.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="846.75" y="442.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="964" y1="454" y2="454"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="964" y1="462" y2="462"/><ellipse cx="715" cy="473" 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="235" x="724" y="476.2104">accept(Visitor const&amp; visitor) const : void</text><!--MD5=[922a89aa4184c1848781b8ddc4d84899]
+link C_0000000410 to C_0000000420--><path d="M362.77,199.95 C256.56,215.45 115.24,244.21 81.5,288 C52.44,325.71 75.94,381.87 101.17,417.58 " fill="none" id="C_0000000410-&gt;C_0000000420" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="104.26,421.83,102.2135,412.1961,101.3242,417.7826,95.7377,416.8933,104.26,421.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f5891fee3e8cc36a7eb33c6b23b909ac]
+link C_0000000420 to C_0000000410--><path d="M129.01,421.83 C112.94,386.47 86.26,327.24 116.5,288 C146.76,248.73 263.53,221.55 357.84,205.18 " fill="none" id="C_0000000420-&gt;C_0000000410" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="362.88,204.31,353.3345,201.8843,357.9515,205.1528,354.6831,209.7699,362.88,204.31" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9c598423852b7c99871ad63fcda0d1d9]
+link C_0000000410 to C_0000000422--><path d="M608.44,204.23 C703.85,220.49 824.65,247.96 855.5,288 C884.44,325.56 861.25,381.41 844.86,417.14 " fill="none" id="C_0000000410-&gt;C_0000000422" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="842.7,421.83,850.1072,415.339,844.798,417.2915,842.8456,411.9822,842.7,421.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4443cd320f78c5f0fa06be61e701a823]
+link C_0000000422 to C_0000000410--><path d="M867.45,421.83 C894.06,386.47 920.74,327.24 890.5,288 C857.21,244.79 719.18,216.22 613.26,200.58 " fill="none" id="C_0000000422-&gt;C_0000000410" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="608.24,199.84,616.5754,205.0861,613.1886,200.5551,617.7196,197.1683,608.24,199.84" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8d8ffdf7cd1a528493c1defbfcb52112]
+link C_0000000412 to C_0000000420--><path d="M201.18,362.3 C188.6,379.65 173.62,400.31 161.25,417.37 " fill="none" id="C_0000000412-&gt;C_0000000420" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="158.16,421.62,166.6709,416.6637,161.0864,417.5659,160.1842,411.9814,158.16,421.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8340dd8c6740ae79d092b60aee7a696d]
+link C_0000000412 to C_0000000422--><path d="M339.22,357.82 C345.05,359.28 350.84,360.68 356.5,362 C471.12,388.67 602.62,412.83 698.65,429.31 " fill="none" id="C_0000000412-&gt;C_0000000422" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="703.77,430.18,695.5731,424.7201,698.8415,429.3372,694.2245,432.6057,703.77,430.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2001dd26aa49264e4295a5279100c286]
+reverse link C_0000000410 to C_0000000412--><path d="M388.68,237.79 C357.47,254.48 323.56,272.62 294.94,287.93 " fill="none" id="C_0000000410&lt;-C_0000000412" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="385.75,231.41,406.69,228.15,392.36,243.76,385.75,231.41" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a7b752461b81b0812d201c5b9e2aac59]
+link C_0000000414 to C_0000000420--><path d="M385.02,362.13 C333.91,380.51 272.4,402.63 223.36,420.26 " fill="none" id="C_0000000414-&gt;C_0000000420" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="218.66,421.96,228.482,422.6867,223.3664,420.272,225.7812,415.1564,218.66,421.96" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e30ba89b4a18096c1c799242bc160630]
+link C_0000000414 to C_0000000422--><path d="M585.98,362.13 C637.09,380.51 698.6,402.63 747.64,420.26 " fill="none" id="C_0000000414-&gt;C_0000000422" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="752.34,421.96,745.2188,415.1564,747.6336,420.272,742.518,422.6867,752.34,421.96" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[99ba5b0d095d5646992c0a542caa35a6]
+reverse link C_0000000410 to C_0000000414--><path d="M485.5,248.62 C485.5,262 485.5,275.71 485.5,287.7 " fill="none" id="C_0000000410&lt;-C_0000000414" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="478.5,248.15,485.5,228.15,492.5,248.15,478.5,248.15" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[77308d65cf17836d04f87ecdbde16625]
+link C_0000000416 to C_0000000420--><path d="M631.78,357.82 C625.95,359.28 620.16,360.68 614.5,362 C499.88,388.67 368.38,412.83 272.35,429.31 " fill="none" id="C_0000000416-&gt;C_0000000420" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="267.23,430.18,276.7755,432.6057,272.1585,429.3372,275.4269,424.7201,267.23,430.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5c8cadb5ca4687e3b14706de471e872c]
+link C_0000000416 to C_0000000422--><path d="M769.82,362.3 C782.4,379.65 797.38,400.31 809.75,417.37 " fill="none" id="C_0000000416-&gt;C_0000000422" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="812.84,421.62,810.8158,411.9814,809.9136,417.5659,804.3291,416.6637,812.84,421.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[04fe2b832ea60674b2d42ccfd8a98967]
+reverse link C_0000000410 to C_0000000416--><path d="M582.32,237.79 C613.53,254.48 647.44,272.62 676.06,287.93 " fill="none" id="C_0000000410&lt;-C_0000000416" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="578.64,243.76,564.31,228.15,585.25,231.41,578.64,243.76" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e9a40fcf6e3ecb87e9e00cc15fc18b84]
+link C_0000000418 to C_0000000410--><path d="M485.5,82.26 C485.5,98.76 485.5,118.51 485.5,136.2 " fill="none" id="C_0000000418-&gt;C_0000000410" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="485.5,141.62,489.5,132.62,485.5,136.62,481.5,132.62,485.5,141.62" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d8cd550e8720cb22d312585a5eb35319]
+reverse link C_0000000418 to C_0000000420--><path d="M342.91,89.23 C249.3,125.88 134.09,188.64 77.5,288 C52.56,331.79 85.27,388.03 111.02,421.83 " fill="none" id="C_0000000418&lt;-C_0000000420" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="340.44,82.69,361.62,82.14,345.4,95.78,340.44,82.69" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[16f48dd32169889efc7589238a1638f4]
+reverse link C_0000000418 to C_0000000422--><path d="M643.55,88.73 C742.32,124.51 861.74,186.48 921.5,288 C938.18,316.34 933.87,331.53 921.5,362 C911.96,385.49 892.97,406.2 875.16,421.77 " fill="none" id="C_0000000418&lt;-C_0000000422" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="640.97,95.24,624.41,82.02,645.6,82.03,640.97,95.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bcaf5f42c5b73b7a1377c0ee24c80ab1]
 @startuml
-abstract "Visitor" as C_0000000357
-abstract C_0000000357 {
+
+abstract "Visitor" as C_0000000410
+abstract C_0000000410 {
 {static} +~Visitor() : void
 {abstract} +visit_A(A const& item) const = 0 : void
 {abstract} +visit_B(B const& item) const = 0 : void
 }
 
-class "Visitor1" as C_0000000359
-class C_0000000359 {
+class "Visitor1" as C_0000000412
+class C_0000000412 {
 +visit_A(A const& item) const : void
 +visit_B(B const& item) const : void
 }
-C_0000000357 <|- - C_0000000359
 
-class "Visitor2" as C_0000000361
-class C_0000000361 {
+class "Visitor2" as C_0000000414
+class C_0000000414 {
 +visit_A(A const& item) const : void
 +visit_B(B const& item) const : void
 }
-C_0000000357 <|- - C_0000000361
 
-class "Visitor3" as C_0000000363
-class C_0000000363 {
+class "Visitor3" as C_0000000416
+class C_0000000416 {
 +visit_A(A const& item) const : void
 +visit_B(B const& item) const : void
 }
-C_0000000357 <|- - C_0000000363
 
-abstract "Item" as C_0000000365
-abstract C_0000000365 {
+abstract "Item" as C_0000000418
+abstract C_0000000418 {
 {static} +~Item() : void
 {abstract} +accept(Visitor const& visitor) const = 0 : void
 }
 
-class "A" as C_0000000367
-class C_0000000367 {
+class "A" as C_0000000420
+class C_0000000420 {
 +accept(Visitor const& visitor) const : void
 }
-C_0000000365 <|- - C_0000000367
 
-class "B" as C_0000000369
-class C_0000000369 {
+class "B" as C_0000000422
+class C_0000000422 {
 +accept(Visitor const& visitor) const : void
 }
-C_0000000365 <|- - C_0000000369
 
-C_0000000357 ..> C_0000000367
-C_0000000357 ..> C_0000000369
-C_0000000359 ..> C_0000000367
-C_0000000359 ..> C_0000000369
-C_0000000361 ..> C_0000000367
-C_0000000361 ..> C_0000000369
-C_0000000363 ..> C_0000000367
-C_0000000363 ..> C_0000000369
-C_0000000365 ..> C_0000000357
-C_0000000367 ..> C_0000000357
-C_0000000369 ..> C_0000000357
+C_0000000410 ..> C_0000000420
+C_0000000410 ..> C_0000000422
+C_0000000412 ..> C_0000000420
+C_0000000412 ..> C_0000000422
+C_0000000410 <|- - C_0000000412
+C_0000000414 ..> C_0000000420
+C_0000000414 ..> C_0000000422
+C_0000000410 <|- - C_0000000414
+C_0000000416 ..> C_0000000420
+C_0000000416 ..> C_0000000422
+C_0000000410 <|- - C_0000000416
+C_0000000418 ..> C_0000000410
+C_0000000420 ..> C_0000000410
+C_0000000418 <|- - C_0000000420
+C_0000000422 ..> C_0000000410
+C_0000000418 <|- - C_0000000422
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index 5873724d..e286fcf2 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,31 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1a5l5pxxu8coa" 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></defs><g><!--MD5=[c4a07f1d9351e267b252c76b63f4fe3b]
-class C_0000000371--><rect fill="#FEFECE" filter="url(#f1a5l5pxxu8coa)" height="86.4141" id="C_0000000371" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="48" y2="48"/><ellipse cx="69.5" cy="59" 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="142" x="78.5" y="62.2104">template_method() : void</text><polygon fill="#FFFF44" points="69.5,66.8047,73.5,70.8047,69.5,74.8047,65.5,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="75.0151">method1() = 0 : void</text><polygon fill="#FFFF44" points="69.5,79.6094,73.5,83.6094,69.5,87.6094,65.5,83.6094" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="87.8198">method2() = 0 : void</text><!--MD5=[c294c93fd6f78a8530e8658e15acce1d]
-class C_0000000373--><rect fill="#FEFECE" filter="url(#f1a5l5pxxu8coa)" height="73.6094" id="C_0000000373" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="194" y2="194"/><polygon fill="#FFFF44" points="17,200,21,204,17,208,13,204" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="208.2104">method1() : void</text><polygon fill="#FFFF44" points="17,212.8047,21,216.8047,17,220.8047,13,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="221.0151">method2() : void</text><!--MD5=[cdaf57e89f624d6f41258fa0e41f2b4d]
-class C_0000000375--><rect fill="#FEFECE" filter="url(#f1a5l5pxxu8coa)" height="73.6094" id="C_0000000375" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="194" y2="194"/><polygon fill="#FFFF44" points="171,200,175,204,171,208,167,204" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="208.2104">method1() : void</text><polygon fill="#FFFF44" points="171,212.8047,175,216.8047,171,220.8047,167,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="221.0151">method2() : void</text><!--MD5=[5dc6c19d9101acbbefb0ec39b54e6bb8]
-reverse link C_0000000371 to C_0000000373--><path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0000000371&lt;-C_0000000373" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="103.12,108.21,118.98,94.15,115.35,115.03,103.12,108.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d8110551103c7a98115d0a6c37b108b4]
-reverse link C_0000000371 to C_0000000375--><path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0000000371&lt;-C_0000000375" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="169.65,115.03,166.02,94.15,181.88,108.21,169.65,115.03" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[00170f1fab389c97fe721b7dea8c018d]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1u2zgw4bjsc12" 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></defs><g><!--MD5=[9bf67a58a7fa3587291bc7315d020434]
+class C_0000000426--><rect fill="#FEFECE" filter="url(#f1u2zgw4bjsc12)" height="86.4141" id="C_0000000426" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="48" y2="48"/><ellipse cx="69.5" cy="59" 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="142" x="78.5" y="62.2104">template_method() : void</text><polygon fill="#FFFF44" points="69.5,66.8047,73.5,70.8047,69.5,74.8047,65.5,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="75.0151">method1() = 0 : void</text><polygon fill="#FFFF44" points="69.5,79.6094,73.5,83.6094,69.5,87.6094,65.5,83.6094" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="87.8198">method2() = 0 : void</text><!--MD5=[491679034f5f78cb4966e891605efcb2]
+class C_0000000428--><rect fill="#FEFECE" filter="url(#f1u2zgw4bjsc12)" height="73.6094" id="C_0000000428" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="194" y2="194"/><polygon fill="#FFFF44" points="17,200,21,204,17,208,13,204" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="208.2104">method1() : void</text><polygon fill="#FFFF44" points="17,212.8047,21,216.8047,17,220.8047,13,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="221.0151">method2() : void</text><!--MD5=[c8143c205f0176c909861010f77a030d]
+class C_0000000430--><rect fill="#FEFECE" filter="url(#f1u2zgw4bjsc12)" height="73.6094" id="C_0000000430" 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"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="194" y2="194"/><polygon fill="#FFFF44" points="171,200,175,204,171,208,167,204" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="208.2104">method1() : void</text><polygon fill="#FFFF44" points="171,212.8047,175,216.8047,171,220.8047,167,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="221.0151">method2() : void</text><!--MD5=[72f92063ec79ea50f387571ad09a4fe8]
+reverse link C_0000000426 to C_0000000428--><path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0000000426&lt;-C_0000000428" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="103.12,108.21,118.98,94.15,115.35,115.03,103.12,108.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0fdecc38660de7255c15a0c459e107a2]
+reverse link C_0000000426 to C_0000000430--><path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0000000426&lt;-C_0000000430" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="169.65,115.03,166.02,94.15,181.88,108.21,169.65,115.03" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4454188742a31b1ffd0a663a5c05710b]
 @startuml
-abstract "A" as C_0000000371
-abstract C_0000000371 {
+
+abstract "A" as C_0000000426
+abstract C_0000000426 {
 +template_method() : void
 {abstract} #method1() = 0 : void
 {abstract} #method2() = 0 : void
 }
 
-class "A1" as C_0000000373
-class C_0000000373 {
+class "A1" as C_0000000428
+class C_0000000428 {
 #method1() : void
 #method2() : void
 }
-C_0000000371 <|- - C_0000000373
 
-class "A2" as C_0000000375
-class C_0000000375 {
+class "A2" as C_0000000430
+class C_0000000430 {
 #method1() : void
 #method2() : void
 }
-C_0000000371 <|- - C_0000000375
 
+C_0000000426 <|- - C_0000000428
+C_0000000426 <|- - C_0000000430
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index d02daa66..4d394d1f 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,48 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:456px;height:377px;" version="1.1" viewBox="0 0 456 377" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="f6li5r2jkgns5" 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></defs><g><!--MD5=[da9dc65f63af1fc6c0a06ad5d778bcea]
-class C_0000000377--><rect fill="#FEFECE" filter="url(#f6li5r2jkgns5)" height="73.6094" id="C_0000000377" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="151.5" y="171"/><ellipse cx="194.4" cy="187" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M194.5094,182.3438 L193.3531,187.4219 L195.6813,187.4219 L194.5094,182.3438 Z M193.025,180.1094 L196.0094,180.1094 L199.3688,192.5 L196.9156,192.5 L196.15,189.4375 L192.8688,189.4375 L192.1188,192.5 L189.6813,192.5 L193.025,180.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.6" y="191.1543">Strategy</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="298.5" y1="203" y2="203"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="298.5" y1="211" y2="211"/><ellipse cx="162.5" cy="222" 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" text-decoration="underline" textLength="100" x="171.5" y="225.2104">~Strategy() : void</text><ellipse cx="162.5" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="171.5" y="238.0151">algorithm() = 0 : void</text><!--MD5=[2a1dd730293fe94ed7144464f1d0e144]
-class C_0000000379--><rect fill="#FEFECE" filter="url(#f6li5r2jkgns5)" height="60.8047" id="C_0000000379" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/><ellipse cx="34.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M37.4688,327.6406 Q36.8906,327.9375 36.25,328.0781 Q35.6094,328.2344 34.9063,328.2344 Q32.4063,328.2344 31.0781,326.5938 Q29.7656,324.9375 29.7656,321.8125 Q29.7656,318.6875 31.0781,317.0313 Q32.4063,315.375 34.9063,315.375 Q35.6094,315.375 36.25,315.5313 Q36.9063,315.6875 37.4688,315.9844 L37.4688,318.7031 Q36.8438,318.125 36.25,317.8594 Q35.6563,317.5781 35.0313,317.5781 Q33.6875,317.5781 33,318.6563 Q32.3125,319.7188 32.3125,321.8125 Q32.3125,323.9063 33,324.9844 Q33.6875,326.0469 35.0313,326.0469 Q35.6563,326.0469 36.25,325.7813 Q36.8438,325.5 37.4688,324.9219 L37.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="326.1543">StrategyA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="346" y2="346"/><ellipse cx="17" cy="357" 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="97" x="26" y="360.2104">algorithm() : void</text><!--MD5=[4cdbe86c41eb49e3a79ca5c5867edbe9]
-class C_0000000381--><rect fill="#FEFECE" filter="url(#f6li5r2jkgns5)" height="60.8047" id="C_0000000381" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/><ellipse cx="192.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M195.4688,327.6406 Q194.8906,327.9375 194.25,328.0781 Q193.6094,328.2344 192.9063,328.2344 Q190.4063,328.2344 189.0781,326.5938 Q187.7656,324.9375 187.7656,321.8125 Q187.7656,318.6875 189.0781,317.0313 Q190.4063,315.375 192.9063,315.375 Q193.6094,315.375 194.25,315.5313 Q194.9063,315.6875 195.4688,315.9844 L195.4688,318.7031 Q194.8438,318.125 194.25,317.8594 Q193.6563,317.5781 193.0313,317.5781 Q191.6875,317.5781 191,318.6563 Q190.3125,319.7188 190.3125,321.8125 Q190.3125,323.9063 191,324.9844 Q191.6875,326.0469 193.0313,326.0469 Q193.6563,326.0469 194.25,325.7813 Q194.8438,325.5 195.4688,324.9219 L195.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="326.1543">StrategyB</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="346" y2="346"/><ellipse cx="175" cy="357" 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="97" x="184" y="360.2104">algorithm() : void</text><!--MD5=[2757998ce34fc5013e0602d055103d74]
-class C_0000000383--><rect fill="#FEFECE" filter="url(#f6li5r2jkgns5)" height="60.8047" id="C_0000000383" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/><ellipse cx="350.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M353.4688,327.6406 Q352.8906,327.9375 352.25,328.0781 Q351.6094,328.2344 350.9063,328.2344 Q348.4063,328.2344 347.0781,326.5938 Q345.7656,324.9375 345.7656,321.8125 Q345.7656,318.6875 347.0781,317.0313 Q348.4063,315.375 350.9063,315.375 Q351.6094,315.375 352.25,315.5313 Q352.9063,315.6875 353.4688,315.9844 L353.4688,318.7031 Q352.8438,318.125 352.25,317.8594 Q351.6563,317.5781 351.0313,317.5781 Q349.6875,317.5781 349,318.6563 Q348.3125,319.7188 348.3125,321.8125 Q348.3125,323.9063 349,324.9844 Q349.6875,326.0469 351.0313,326.0469 Q351.6563,326.0469 352.25,325.7813 Q352.8438,325.5 353.4688,324.9219 L353.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="326.1543">StrategyC</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="346" y2="346"/><ellipse cx="333" cy="357" 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="97" x="342" y="360.2104">algorithm() : void</text><!--MD5=[7ee13cd3090cf9a92edafb5b21f86ca8]
-class C_0000000385--><rect fill="#FEFECE" filter="url(#f6li5r2jkgns5)" height="86.4141" id="C_0000000385" 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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="54.2104">m_strategy : std::unique_ptr&lt;Strategy&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="60.8047" y2="60.8047"/><ellipse cx="79" cy="71.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" text-decoration="underline" textLength="289" x="88" y="75.0151">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text><ellipse cx="79" cy="84.6094" 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="73" x="88" y="87.8198">apply() : void</text><!--MD5=[b30e00c23deb395cb1e0f0f328b2382e]
-reverse link C_0000000377 to C_0000000379--><path d="M164.47,257.86 C144.26,274.05 122.38,291.56 104.53,305.85 " fill="none" id="C_0000000377&lt;-C_0000000379" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="160.24,252.29,180.22,245.25,168.99,263.21,160.24,252.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[69e6ce01825ab7f8574d272a685264c8]
-reverse link C_0000000377 to C_0000000381--><path d="M225.5,265.55 C225.5,279.38 225.5,293.64 225.5,305.64 " fill="none" id="C_0000000377&lt;-C_0000000381" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="218.5,265.25,225.5,245.25,232.5,265.25,218.5,265.25" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f03d9159c86be2b690303e1a04021c92]
-reverse link C_0000000377 to C_0000000383--><path d="M286.53,257.86 C306.74,274.05 328.62,291.56 346.47,305.85 " fill="none" id="C_0000000377&lt;-C_0000000383" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="282.01,263.21,270.78,245.25,290.76,252.29,282.01,263.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2b3386afe83c4c3f94549eb3cb1bfa10]
-link C_0000000385 to C_0000000377--><path d="M219.92,94.08 C218.55,108.9 217.69,125.68 218.5,141 C218.92,149 219.63,157.53 220.44,165.71 " fill="none" id="C_0000000385-&gt;C_0000000377" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="220.96,170.74,224.0127,161.3762,220.4455,165.7665,216.0551,162.1994,220.96,170.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[63cc4db36052addb332b5be024fdcf75]
-reverse link C_0000000385 to C_0000000377--><path d="M225.5,107.43 C225.5,128.49 225.5,151.91 225.5,170.75 " fill="none" id="C_0000000385&lt;-C_0000000377" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="225.5,94.35,221.5,100.35,225.5,106.35,229.5,100.35,225.5,94.35" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="228.5" y="130.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="137.0669">m_strategy</text><!--MD5=[c6537258ac3d8185dc1243930b3587a5]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:456px;height:377px;" version="1.1" viewBox="0 0 456 377" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="f1dj9t3dpkfidd" 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></defs><g><!--MD5=[f3f4fcb348b1deeeb7a89b973ffbd615]
+class C_0000000434--><rect fill="#FEFECE" filter="url(#f1dj9t3dpkfidd)" height="73.6094" id="C_0000000434" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="151.5" y="171"/><ellipse cx="194.4" cy="187" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M194.5094,182.3438 L193.3531,187.4219 L195.6813,187.4219 L194.5094,182.3438 Z M193.025,180.1094 L196.0094,180.1094 L199.3688,192.5 L196.9156,192.5 L196.15,189.4375 L192.8688,189.4375 L192.1188,192.5 L189.6813,192.5 L193.025,180.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.6" y="191.1543">Strategy</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="298.5" y1="203" y2="203"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="298.5" y1="211" y2="211"/><ellipse cx="162.5" cy="222" 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" text-decoration="underline" textLength="100" x="171.5" y="225.2104">~Strategy() : void</text><ellipse cx="162.5" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="171.5" y="238.0151">algorithm() = 0 : void</text><!--MD5=[05ce03ea7a44ce5e2fc5f85b4e873bca]
+class C_0000000436--><rect fill="#FEFECE" filter="url(#f1dj9t3dpkfidd)" height="60.8047" id="C_0000000436" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/><ellipse cx="34.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M37.4688,327.6406 Q36.8906,327.9375 36.25,328.0781 Q35.6094,328.2344 34.9063,328.2344 Q32.4063,328.2344 31.0781,326.5938 Q29.7656,324.9375 29.7656,321.8125 Q29.7656,318.6875 31.0781,317.0313 Q32.4063,315.375 34.9063,315.375 Q35.6094,315.375 36.25,315.5313 Q36.9063,315.6875 37.4688,315.9844 L37.4688,318.7031 Q36.8438,318.125 36.25,317.8594 Q35.6563,317.5781 35.0313,317.5781 Q33.6875,317.5781 33,318.6563 Q32.3125,319.7188 32.3125,321.8125 Q32.3125,323.9063 33,324.9844 Q33.6875,326.0469 35.0313,326.0469 Q35.6563,326.0469 36.25,325.7813 Q36.8438,325.5 37.4688,324.9219 L37.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="326.1543">StrategyA</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="346" y2="346"/><ellipse cx="17" cy="357" 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="97" x="26" y="360.2104">algorithm() : void</text><!--MD5=[ec6d9218c7d079356a7adb4c04160c5c]
+class C_0000000438--><rect fill="#FEFECE" filter="url(#f1dj9t3dpkfidd)" height="60.8047" id="C_0000000438" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/><ellipse cx="192.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M195.4688,327.6406 Q194.8906,327.9375 194.25,328.0781 Q193.6094,328.2344 192.9063,328.2344 Q190.4063,328.2344 189.0781,326.5938 Q187.7656,324.9375 187.7656,321.8125 Q187.7656,318.6875 189.0781,317.0313 Q190.4063,315.375 192.9063,315.375 Q193.6094,315.375 194.25,315.5313 Q194.9063,315.6875 195.4688,315.9844 L195.4688,318.7031 Q194.8438,318.125 194.25,317.8594 Q193.6563,317.5781 193.0313,317.5781 Q191.6875,317.5781 191,318.6563 Q190.3125,319.7188 190.3125,321.8125 Q190.3125,323.9063 191,324.9844 Q191.6875,326.0469 193.0313,326.0469 Q193.6563,326.0469 194.25,325.7813 Q194.8438,325.5 195.4688,324.9219 L195.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="326.1543">StrategyB</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="346" y2="346"/><ellipse cx="175" cy="357" 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="97" x="184" y="360.2104">algorithm() : void</text><!--MD5=[4aa70c4b7fbd5d753e5c521573d33834]
+class C_0000000440--><rect fill="#FEFECE" filter="url(#f1dj9t3dpkfidd)" height="60.8047" id="C_0000000440" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/><ellipse cx="350.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M353.4688,327.6406 Q352.8906,327.9375 352.25,328.0781 Q351.6094,328.2344 350.9063,328.2344 Q348.4063,328.2344 347.0781,326.5938 Q345.7656,324.9375 345.7656,321.8125 Q345.7656,318.6875 347.0781,317.0313 Q348.4063,315.375 350.9063,315.375 Q351.6094,315.375 352.25,315.5313 Q352.9063,315.6875 353.4688,315.9844 L353.4688,318.7031 Q352.8438,318.125 352.25,317.8594 Q351.6563,317.5781 351.0313,317.5781 Q349.6875,317.5781 349,318.6563 Q348.3125,319.7188 348.3125,321.8125 Q348.3125,323.9063 349,324.9844 Q349.6875,326.0469 351.0313,326.0469 Q351.6563,326.0469 352.25,325.7813 Q352.8438,325.5 353.4688,324.9219 L353.4688,327.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="326.1543">StrategyC</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="338" y2="338"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="346" y2="346"/><ellipse cx="333" cy="357" 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="97" x="342" y="360.2104">algorithm() : void</text><!--MD5=[85fbf87ef7fdcb2ed7fc3c99d5236d4c]
+class C_0000000442--><rect fill="#FEFECE" filter="url(#f1dj9t3dpkfidd)" height="86.4141" id="C_0000000442" 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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="48"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="54.2104">m_strategy : std::unique_ptr&lt;Strategy&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="60.8047" y2="60.8047"/><ellipse cx="79" cy="71.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" text-decoration="underline" textLength="289" x="88" y="75.0151">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text><ellipse cx="79" cy="84.6094" 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="73" x="88" y="87.8198">apply() : void</text><!--MD5=[f399094d51b34e3c591076ed6adba497]
+reverse link C_0000000434 to C_0000000436--><path d="M164.47,257.86 C144.26,274.05 122.38,291.56 104.53,305.85 " fill="none" id="C_0000000434&lt;-C_0000000436" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="160.24,252.29,180.22,245.25,168.99,263.21,160.24,252.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3af43b886e9013d48b3eb5f9faa61fc0]
+reverse link C_0000000434 to C_0000000438--><path d="M225.5,265.55 C225.5,279.38 225.5,293.64 225.5,305.64 " fill="none" id="C_0000000434&lt;-C_0000000438" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="218.5,265.25,225.5,245.25,232.5,265.25,218.5,265.25" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c87cfeb8a324f0a81bf3782f5dddafa6]
+reverse link C_0000000434 to C_0000000440--><path d="M286.53,257.86 C306.74,274.05 328.62,291.56 346.47,305.85 " fill="none" id="C_0000000434&lt;-C_0000000440" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="282.01,263.21,270.78,245.25,290.76,252.29,282.01,263.21" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6b45b33ddba43bd900220657b304b327]
+link C_0000000442 to C_0000000434--><path d="M219.92,94.08 C218.55,108.9 217.69,125.68 218.5,141 C218.92,149 219.63,157.53 220.44,165.71 " fill="none" id="C_0000000442-&gt;C_0000000434" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="220.96,170.74,224.0127,161.3762,220.4455,165.7665,216.0551,162.1994,220.96,170.74" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0ec1acb616fd94816fd7384e0952d482]
+reverse link C_0000000442 to C_0000000434--><path d="M225.5,107.43 C225.5,128.49 225.5,151.91 225.5,170.75 " fill="none" id="C_0000000442&lt;-C_0000000434" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="225.5,94.35,221.5,100.35,225.5,106.35,229.5,100.35,225.5,94.35" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="228.5" y="130.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="137.0669">m_strategy</text><!--MD5=[90cfafc81429a431cb6ffccd42060d91]
 @startuml
-abstract "Strategy" as C_0000000377
-abstract C_0000000377 {
+
+abstract "Strategy" as C_0000000434
+abstract C_0000000434 {
 {static} +~Strategy() : void
 {abstract} +algorithm() = 0 : void
 }
 
-class "StrategyA" as C_0000000379
-class C_0000000379 {
+class "StrategyA" as C_0000000436
+class C_0000000436 {
 +algorithm() : void
 }
-C_0000000377 <|- - C_0000000379
 
-class "StrategyB" as C_0000000381
-class C_0000000381 {
+class "StrategyB" as C_0000000438
+class C_0000000438 {
 +algorithm() : void
 }
-C_0000000377 <|- - C_0000000381
 
-class "StrategyC" as C_0000000383
-class C_0000000383 {
+class "StrategyC" as C_0000000440
+class C_0000000440 {
 +algorithm() : void
 }
-C_0000000377 <|- - C_0000000383
 
-class "Context" as C_0000000385
-class C_0000000385 {
+class "Context" as C_0000000442
+class C_0000000442 {
 {static} +Context(std::unique_ptr<Strategy> strategy) : void
 +apply() : void
 -m_strategy : std::unique_ptr<Strategy>
 }
 
-C_0000000385 ..> C_0000000377
-C_0000000385 o- - C_0000000377 : -m_strategy
+C_0000000434 <|- - C_0000000436
+C_0000000434 <|- - C_0000000438
+C_0000000434 <|- - C_0000000440
+C_0000000442 ..> C_0000000434
+C_0000000442 o- - C_0000000434 : -m_strategy
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index fd27387a..4c02ceb0 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,46 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:542px;height:281px;" version="1.1" viewBox="0 0 542 281" width="542px" zoomAndPan="magnify"><defs><filter height="300%" id="f1cmep0n1dsz3v" 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></defs><g><!--MD5=[c9feb1c3ac0f2c343abb326dabedb4be]
-class C_0000000389--><rect fill="#FEFECE" filter="url(#f1cmep0n1dsz3v)" height="86.4141" id="C_0000000389" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="258" y="8"/><ellipse cx="291.9" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M292.0094,19.3438 L290.8531,24.4219 L293.1813,24.4219 L292.0094,19.3438 Z M290.525,17.1094 L293.5094,17.1094 L296.8688,29.5 L294.4156,29.5 L293.65,26.4375 L290.3688,26.4375 L289.6188,29.5 L287.1813,29.5 L290.525,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="310.1" y="28.1543">Target</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="372" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="372" y1="48" y2="48"/><ellipse cx="269" cy="59" 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" text-decoration="underline" textLength="89" x="278" y="62.2104">~Target() : void</text><ellipse cx="269" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="278" y="75.0151">m1() = 0 : void</text><ellipse cx="269" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="278" y="87.8198">m2() = 0 : void</text><!--MD5=[aa1a4070660858674624de90e9f12e06]
-class C_0000000391--><rect fill="#FEFECE" filter="url(#f1cmep0n1dsz3v)" height="73.6094" id="C_0000000391" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/><ellipse cx="23.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M26.6688,205.1406 Q26.0906,205.4375 25.45,205.5781 Q24.8094,205.7344 24.1063,205.7344 Q21.6063,205.7344 20.2781,204.0938 Q18.9656,202.4375 18.9656,199.3125 Q18.9656,196.1875 20.2781,194.5313 Q21.6063,192.875 24.1063,192.875 Q24.8094,192.875 25.45,193.0313 Q26.1063,193.1875 26.6688,193.4844 L26.6688,196.2031 Q26.0438,195.625 25.45,195.3594 Q24.8563,195.0781 24.2313,195.0781 Q22.8875,195.0781 22.2,196.1563 Q21.5125,197.2188 21.5125,199.3125 Q21.5125,201.4063 22.2,202.4844 Q22.8875,203.5469 24.2313,203.5469 Q24.8563,203.5469 25.45,203.2813 Q26.0438,203 26.6688,202.4219 L26.6688,205.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="203.6543">Target1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="215.5" y2="215.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="223.5" y2="223.5"/><ellipse cx="17" cy="234.5" 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="61" x="26" y="237.7104">m1() : void</text><ellipse cx="17" cy="247.3047" 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="61" x="26" y="250.5151">m2() : void</text><!--MD5=[48e077b265b11ae427856b88da124a83]
-class C_0000000393--><rect fill="#FEFECE" filter="url(#f1cmep0n1dsz3v)" height="73.6094" id="C_0000000393" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/><ellipse cx="145.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M148.6688,205.1406 Q148.0906,205.4375 147.45,205.5781 Q146.8094,205.7344 146.1063,205.7344 Q143.6063,205.7344 142.2781,204.0938 Q140.9656,202.4375 140.9656,199.3125 Q140.9656,196.1875 142.2781,194.5313 Q143.6063,192.875 146.1063,192.875 Q146.8094,192.875 147.45,193.0313 Q148.1063,193.1875 148.6688,193.4844 L148.6688,196.2031 Q148.0438,195.625 147.45,195.3594 Q146.8563,195.0781 146.2313,195.0781 Q144.8875,195.0781 144.2,196.1563 Q143.5125,197.2188 143.5125,199.3125 Q143.5125,201.4063 144.2,202.4844 Q144.8875,203.5469 146.2313,203.5469 Q146.8563,203.5469 147.45,203.2813 Q148.0438,203 148.6688,202.4219 L148.6688,205.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="203.6543">Target2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="215.5" y2="215.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="223.5" y2="223.5"/><ellipse cx="139" cy="234.5" 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="61" x="148" y="237.7104">m1() : void</text><ellipse cx="139" cy="247.3047" 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="61" x="148" y="250.5151">m2() : void</text><!--MD5=[2ce3b89a5e0022adb5dbb0b3dd08092c]
-class C_0000000395--><rect fill="#FEFECE" filter="url(#f1cmep0n1dsz3v)" height="99.2188" id="C_0000000395" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/><ellipse cx="369.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M372.7188,192.6406 Q372.1406,192.9375 371.5,193.0781 Q370.8594,193.2344 370.1563,193.2344 Q367.6563,193.2344 366.3281,191.5938 Q365.0156,189.9375 365.0156,186.8125 Q365.0156,183.6875 366.3281,182.0313 Q367.6563,180.375 370.1563,180.375 Q370.8594,180.375 371.5,180.5313 Q372.1563,180.6875 372.7188,180.9844 L372.7188,183.7031 Q372.0938,183.125 371.5,182.8594 Q370.9063,182.5781 370.2813,182.5781 Q368.9375,182.5781 368.25,183.6563 Q367.5625,184.7188 367.5625,186.8125 Q367.5625,188.9063 368.25,189.9844 Q368.9375,191.0469 370.2813,191.0469 Q370.9063,191.0469 371.5,190.7813 Q372.0938,190.5 372.7188,189.9219 L372.7188,192.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="191.1543">Proxy</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="203" y2="203"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="211"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="217.2104">m_target : std::shared_ptr&lt;Target&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="223.8047" y2="223.8047"/><ellipse cx="261" cy="234.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" text-decoration="underline" textLength="255" x="270" y="238.0151">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text><ellipse cx="261" cy="247.6094" 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="61" x="270" y="250.8198">m1() : void</text><ellipse cx="261" cy="260.4141" 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="61" x="270" y="263.6245">m2() : void</text><!--MD5=[72bbe9278234bb76d31ba3fbaf1faca0]
-reverse link C_0000000389 to C_0000000391--><path d="M239.88,92.42 C200.47,114.35 151.97,142.7 110.5,171 C104.8,174.89 98.95,179.15 93.24,183.49 " fill="none" id="C_0000000389&lt;-C_0000000391" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="236.68,86.19,257.58,82.67,243.44,98.45,236.68,86.19" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0e068f479157b35782fe0e85748627d3]
-reverse link C_0000000389 to C_0000000393--><path d="M265.83,109.78 C244.79,134.25 220.92,162.02 202.46,183.49 " fill="none" id="C_0000000389&lt;-C_0000000393" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="260.82,104.87,279.16,94.27,271.43,114,260.82,104.87" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[db76d2231bacbb98d8f798094b00bdfa]
-reverse link C_0000000389 to C_0000000395--><path d="M325.26,112.97 C329.19,122.37 333.44,131.95 337.5,141 C341.86,150.71 346.56,161.08 351.46,170.98 " fill="none" id="C_0000000389&lt;-C_0000000395" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="318.67,115.34,317.79,94.17,331.68,110.17,318.67,115.34" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[fc2ffef7e70eac763cc679ee61b56f04]
-link C_0000000395 to C_0000000389--><path d="M385.71,170.98 C381.56,161.08 376.86,150.71 372.5,141 C366.36,127.31 359.78,112.39 353.05,98.74 " fill="none" id="C_0000000395-&gt;C_0000000389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="350.76,94.17,351.1946,104.0093,352.9903,98.645,358.3546,100.4407,350.76,94.17" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[fc2ffef7e70eac763cc679ee61b56f04]
-link C_0000000395 to C_0000000389--><path d="M371.37,170.61 C365.25,155.56 358.3,139.01 351.5,124 C347.75,115.73 343.59,107.02 339.46,98.63 " fill="none" id="C_0000000395-&gt;C_0000000389-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="337.17,94,337.5669,103.8409,339.3832,98.4835,344.7405,100.2997,337.17,94" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="360.5" y="130.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="59" x="370.5" y="137.0669">m_target</text><!--MD5=[9d3c39084eac15382306cc03fc14efd0]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:542px;height:281px;" version="1.1" viewBox="0 0 542 281" width="542px" zoomAndPan="magnify"><defs><filter height="300%" id="fvjekfzmxu54q" 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></defs><g><!--MD5=[2d8f87d529f619096345a1eaa4d93f5b]
+class C_0000000448--><rect fill="#FEFECE" filter="url(#fvjekfzmxu54q)" height="86.4141" id="C_0000000448" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="258" y="8"/><ellipse cx="291.9" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M292.0094,19.3438 L290.8531,24.4219 L293.1813,24.4219 L292.0094,19.3438 Z M290.525,17.1094 L293.5094,17.1094 L296.8688,29.5 L294.4156,29.5 L293.65,26.4375 L290.3688,26.4375 L289.6188,29.5 L287.1813,29.5 L290.525,17.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="310.1" y="28.1543">Target</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="372" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="372" y1="48" y2="48"/><ellipse cx="269" cy="59" 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" text-decoration="underline" textLength="89" x="278" y="62.2104">~Target() : void</text><ellipse cx="269" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="278" y="75.0151">m1() = 0 : void</text><ellipse cx="269" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="278" y="87.8198">m2() = 0 : void</text><!--MD5=[fc27616bbc180b0439b2cc752621aeca]
+class C_0000000450--><rect fill="#FEFECE" filter="url(#fvjekfzmxu54q)" height="73.6094" id="C_0000000450" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/><ellipse cx="23.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M26.6688,205.1406 Q26.0906,205.4375 25.45,205.5781 Q24.8094,205.7344 24.1063,205.7344 Q21.6063,205.7344 20.2781,204.0938 Q18.9656,202.4375 18.9656,199.3125 Q18.9656,196.1875 20.2781,194.5313 Q21.6063,192.875 24.1063,192.875 Q24.8094,192.875 25.45,193.0313 Q26.1063,193.1875 26.6688,193.4844 L26.6688,196.2031 Q26.0438,195.625 25.45,195.3594 Q24.8563,195.0781 24.2313,195.0781 Q22.8875,195.0781 22.2,196.1563 Q21.5125,197.2188 21.5125,199.3125 Q21.5125,201.4063 22.2,202.4844 Q22.8875,203.5469 24.2313,203.5469 Q24.8563,203.5469 25.45,203.2813 Q26.0438,203 26.6688,202.4219 L26.6688,205.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="203.6543">Target1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="215.5" y2="215.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="223.5" y2="223.5"/><ellipse cx="17" cy="234.5" 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="61" x="26" y="237.7104">m1() : void</text><ellipse cx="17" cy="247.3047" 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="61" x="26" y="250.5151">m2() : void</text><!--MD5=[2fad8409a5951345f5d17a1413a2907e]
+class C_0000000452--><rect fill="#FEFECE" filter="url(#fvjekfzmxu54q)" height="73.6094" id="C_0000000452" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/><ellipse cx="145.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M148.6688,205.1406 Q148.0906,205.4375 147.45,205.5781 Q146.8094,205.7344 146.1063,205.7344 Q143.6063,205.7344 142.2781,204.0938 Q140.9656,202.4375 140.9656,199.3125 Q140.9656,196.1875 142.2781,194.5313 Q143.6063,192.875 146.1063,192.875 Q146.8094,192.875 147.45,193.0313 Q148.1063,193.1875 148.6688,193.4844 L148.6688,196.2031 Q148.0438,195.625 147.45,195.3594 Q146.8563,195.0781 146.2313,195.0781 Q144.8875,195.0781 144.2,196.1563 Q143.5125,197.2188 143.5125,199.3125 Q143.5125,201.4063 144.2,202.4844 Q144.8875,203.5469 146.2313,203.5469 Q146.8563,203.5469 147.45,203.2813 Q148.0438,203 148.6688,202.4219 L148.6688,205.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="203.6543">Target2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="215.5" y2="215.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="223.5" y2="223.5"/><ellipse cx="139" cy="234.5" 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="61" x="148" y="237.7104">m1() : void</text><ellipse cx="139" cy="247.3047" 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="61" x="148" y="250.5151">m2() : void</text><!--MD5=[7f499941e8e44c7cff30dbfbfdbfbbb7]
+class C_0000000454--><rect fill="#FEFECE" filter="url(#fvjekfzmxu54q)" height="99.2188" id="C_0000000454" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/><ellipse cx="369.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M372.7188,192.6406 Q372.1406,192.9375 371.5,193.0781 Q370.8594,193.2344 370.1563,193.2344 Q367.6563,193.2344 366.3281,191.5938 Q365.0156,189.9375 365.0156,186.8125 Q365.0156,183.6875 366.3281,182.0313 Q367.6563,180.375 370.1563,180.375 Q370.8594,180.375 371.5,180.5313 Q372.1563,180.6875 372.7188,180.9844 L372.7188,183.7031 Q372.0938,183.125 371.5,182.8594 Q370.9063,182.5781 370.2813,182.5781 Q368.9375,182.5781 368.25,183.6563 Q367.5625,184.7188 367.5625,186.8125 Q367.5625,188.9063 368.25,189.9844 Q368.9375,191.0469 370.2813,191.0469 Q370.9063,191.0469 371.5,190.7813 Q372.0938,190.5 372.7188,189.9219 L372.7188,192.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="191.1543">Proxy</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="203" y2="203"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="211"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="217.2104">m_target : std::shared_ptr&lt;Target&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="223.8047" y2="223.8047"/><ellipse cx="261" cy="234.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" text-decoration="underline" textLength="255" x="270" y="238.0151">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text><ellipse cx="261" cy="247.6094" 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="61" x="270" y="250.8198">m1() : void</text><ellipse cx="261" cy="260.4141" 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="61" x="270" y="263.6245">m2() : void</text><!--MD5=[0658e62f2df5329da3d870a572bc3de8]
+reverse link C_0000000448 to C_0000000450--><path d="M239.88,92.42 C200.47,114.35 151.97,142.7 110.5,171 C104.8,174.89 98.95,179.15 93.24,183.49 " fill="none" id="C_0000000448&lt;-C_0000000450" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="236.68,86.19,257.58,82.67,243.44,98.45,236.68,86.19" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c73681aecb87073d0d6a89f6f1dd94f4]
+reverse link C_0000000448 to C_0000000452--><path d="M265.83,109.78 C244.79,134.25 220.92,162.02 202.46,183.49 " fill="none" id="C_0000000448&lt;-C_0000000452" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="260.82,104.87,279.16,94.27,271.43,114,260.82,104.87" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[001c4a5aa25e3ff88dcd3a41bbd0b378]
+link C_0000000454 to C_0000000448--><path d="M385.71,170.98 C381.56,161.08 376.86,150.71 372.5,141 C366.36,127.31 359.78,112.39 353.05,98.74 " fill="none" id="C_0000000454-&gt;C_0000000448" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="350.76,94.17,351.1946,104.0093,352.9903,98.645,358.3546,100.4407,350.76,94.17" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[001c4a5aa25e3ff88dcd3a41bbd0b378]
+link C_0000000454 to C_0000000448--><path d="M371.37,170.61 C365.25,155.56 358.3,139.01 351.5,124 C347.75,115.73 343.59,107.02 339.46,98.63 " fill="none" id="C_0000000454-&gt;C_0000000448-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="337.17,94,337.5669,103.8409,339.3832,98.4835,344.7405,100.2997,337.17,94" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="360.5" y="130.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="59" x="370.5" y="137.0669">m_target</text><!--MD5=[8bb1290668a8546ebad19064fb65ace0]
+reverse link C_0000000448 to C_0000000454--><path d="M325.26,112.97 C329.19,122.37 333.44,131.95 337.5,141 C341.86,150.71 346.56,161.08 351.46,170.98 " fill="none" id="C_0000000448&lt;-C_0000000454" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="318.67,115.34,317.79,94.17,331.68,110.17,318.67,115.34" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c64cf40b8162e627c486c8ccd0657c13]
 @startuml
-abstract "Target" as C_0000000389
-abstract C_0000000389 {
+
+abstract "Target" as C_0000000448
+abstract C_0000000448 {
 {static} +~Target() : void
 {abstract} +m1() = 0 : void
 {abstract} +m2() = 0 : void
 }
 
-class "Target1" as C_0000000391
-class C_0000000391 {
+class "Target1" as C_0000000450
+class C_0000000450 {
 +m1() : void
 +m2() : void
 }
-C_0000000389 <|- - C_0000000391
 
-class "Target2" as C_0000000393
-class C_0000000393 {
+class "Target2" as C_0000000452
+class C_0000000452 {
 +m1() : void
 +m2() : void
 }
-C_0000000389 <|- - C_0000000393
 
-class "Proxy" as C_0000000395
-class C_0000000395 {
+class "Proxy" as C_0000000454
+class C_0000000454 {
 {static} +Proxy(std::shared_ptr<Target> target) : void
 +m1() : void
 +m2() : void
 -m_target : std::shared_ptr<Target>
 }
-C_0000000389 <|- - C_0000000395
 
-C_0000000395 ..> C_0000000389
-C_0000000395 - -> C_0000000389 : -m_target
+C_0000000448 <|- - C_0000000450
+C_0000000448 <|- - C_0000000452
+C_0000000454 ..> C_0000000448
+C_0000000454 - -> C_0000000448 : -m_target
+C_0000000448 <|- - C_0000000454
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index 46cc96aa..8650a211 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,57 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="378px" preserveAspectRatio="none" style="width:512px;height:378px;" version="1.1" viewBox="0 0 512 378" width="512px" zoomAndPan="magnify"><defs><filter height="300%" id="f1c6uj8zu8dg16" 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></defs><g><!--MD5=[59debac55fd3a1c044c091b8f31b75e0]
-class C_0000000399--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="73.6094" id="C_0000000399" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/><ellipse cx="23.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M26.6688,302.1406 Q26.0906,302.4375 25.45,302.5781 Q24.8094,302.7344 24.1063,302.7344 Q21.6063,302.7344 20.2781,301.0938 Q18.9656,299.4375 18.9656,296.3125 Q18.9656,293.1875 20.2781,291.5313 Q21.6063,289.875 24.1063,289.875 Q24.8094,289.875 25.45,290.0313 Q26.1063,290.1875 26.6688,290.4844 L26.6688,293.2031 Q26.0438,292.625 25.45,292.3594 Q24.8563,292.0781 24.2313,292.0781 Q22.8875,292.0781 22.2,293.1563 Q21.5125,294.2188 21.5125,296.3125 Q21.5125,298.4063 22.2,299.4844 Q22.8875,300.5469 24.2313,300.5469 Q24.8563,300.5469 25.45,300.2813 Q26.0438,300 26.6688,299.4219 L26.6688,302.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="300.6543">Target1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="312.5" y2="312.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="320.5" y2="320.5"/><ellipse cx="17" cy="331.5" 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="61" x="26" y="334.7104">m1() : void</text><ellipse cx="17" cy="344.3047" 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="61" x="26" y="347.5151">m2() : void</text><!--MD5=[fcf362384209d042d024a045b0b44cef]
-class C_0000000401--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="73.6094" id="C_0000000401" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="280.5"/><ellipse cx="431.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M434.6688,302.1406 Q434.0906,302.4375 433.45,302.5781 Q432.8094,302.7344 432.1063,302.7344 Q429.6063,302.7344 428.2781,301.0938 Q426.9656,299.4375 426.9656,296.3125 Q426.9656,293.1875 428.2781,291.5313 Q429.6063,289.875 432.1063,289.875 Q432.8094,289.875 433.45,290.0313 Q434.1063,290.1875 434.6688,290.4844 L434.6688,293.2031 Q434.0438,292.625 433.45,292.3594 Q432.8563,292.0781 432.2313,292.0781 Q430.8875,292.0781 430.2,293.1563 Q429.5125,294.2188 429.5125,296.3125 Q429.5125,298.4063 430.2,299.4844 Q430.8875,300.5469 432.2313,300.5469 Q432.8563,300.5469 433.45,300.2813 Q434.0438,300 434.6688,299.4219 L434.6688,302.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="300.6543">Target2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="312.5" y2="312.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="320.5" y2="320.5"/><ellipse cx="425" cy="331.5" 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="61" x="434" y="334.7104">m1() : void</text><ellipse cx="425" cy="344.3047" 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="61" x="434" y="347.5151">m2() : void</text><!--MD5=[5aaf764dad26edf27edd0d0a49fbf3af]
-class C_0000000403--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="99.2188" id="C_0000000403" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="373" y="265"/><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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="314.2104">m_target : std::shared_ptr&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="320.8047" y2="320.8047"/><ellipse cx="139" cy="331.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" text-decoration="underline" textLength="225" x="148" y="335.0151">Proxy(std::shared_ptr&lt;T&gt; target) : void</text><ellipse cx="139" cy="344.6094" 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="61" x="148" y="347.8198">m1() : void</text><ellipse cx="139" cy="357.4141" 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="61" x="148" y="360.6245">m2() : void</text><!--MD5=[e0a1e4425bde191ff7195ad1daff1d2e]
-class C_0000000408--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="48" id="C_0000000408" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="51" x="160.5" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="161.5" y="168.1387">Target1</text><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"/><!--MD5=[bc58df5f5dd33cd478a0d5a59298cba5]
-class C_0000000409--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="48" id="C_0000000409" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="51" x="313.5" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="314.5" y="168.1387">Target2</text><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"/><!--MD5=[4a8a7d22069537f8f48b5158b5faf1f7]
-class C_0000000407--><rect fill="#FEFECE" filter="url(#f1c6uj8zu8dg16)" height="73.6094" id="C_0000000407" 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"/><ellipse cx="152" cy="51" 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="143" x="161" y="54.2104">proxy1 : Proxy&lt;Target1&gt;</text><ellipse cx="152" cy="63.8047" 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="143" x="161" y="67.0151">proxy2 : Proxy&lt;Target2&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="73.6094" y2="73.6094"/><!--MD5=[d349d7f909681aec5b9d72acc226e733]
-link C_0000000408 to C_0000000399--><path d="M132.08,207.08 C117.7,226.14 96.95,253.63 79.85,276.29 " fill="none" id="C_0000000408-&gt;C_0000000399" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="76.7,280.46,85.3109,275.6796,79.7091,276.4669,78.9219,270.865,76.7,280.46" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[90c4182929ab79b79263dcdfa41a3969]
-link C_0000000408 to C_0000000403--><path d="M167.62,207.08 C177.48,219.65 190.23,235.89 202.86,251.99 " fill="none" id="C_0000000408-&gt;C_0000000403" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="208.51,247.85,215.36,267.9,197.5,256.49,208.51,247.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7fa79bc77fe1d0dbb72b0a04ccd7dac4]
-link C_0000000409 to C_0000000401--><path d="M329.5,207.08 C352.07,226.37 384.76,254.32 411.45,277.14 " fill="none" id="C_0000000409-&gt;C_0000000401" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="415.34,280.46,411.0906,271.5751,411.5367,277.2143,405.8974,277.6604,415.34,280.46" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0980ba8a6e2a67e8791d4a6204ddfdd2]
-link C_0000000409 to C_0000000403--><path d="M293.96,207.08 C289.61,218.86 284.06,233.87 278.47,248.97 " fill="none" id="C_0000000409-&gt;C_0000000403" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="284.97,251.57,271.47,267.9,271.84,246.72,284.97,251.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b5f8462c245cccef0515c5253f4083bc]
-reverse link C_0000000407 to C_0000000408--><path d="M198.65,93.87 C195.23,99.97 191.78,106.13 188.5,112 C179.74,127.67 169.91,145.32 162.31,158.98 " fill="none" id="C_0000000407&lt;-C_0000000408" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="205.13,82.3,198.7072,85.5784,199.2631,92.768,205.6859,89.4896,205.13,82.3" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="194.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="201.5" y="125.0669">proxy1</text><!--MD5=[9e77c930b80057970db1a619a43a6e50]
-reverse link C_0000000407 to C_0000000409--><path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0000000407&lt;-C_0000000409" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="245.93,82.09,245.4025,89.2818,251.8382,92.5348,252.3657,85.343,245.93,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="276.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="283.5" y="125.0669">proxy2</text><!--MD5=[e7cacfd042b56f863a53b23b9e99ef43]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="378px" preserveAspectRatio="none" style="width:512px;height:378px;" version="1.1" viewBox="0 0 512 378" width="512px" zoomAndPan="magnify"><defs><filter height="300%" id="fem6a6bbjbc1y" 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></defs><g><!--MD5=[4f6c0ed9042e31c8916ebd5e6c18a67a]
+class C_0000000460--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="73.6094" id="C_0000000460" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/><ellipse cx="23.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M26.6688,302.1406 Q26.0906,302.4375 25.45,302.5781 Q24.8094,302.7344 24.1063,302.7344 Q21.6063,302.7344 20.2781,301.0938 Q18.9656,299.4375 18.9656,296.3125 Q18.9656,293.1875 20.2781,291.5313 Q21.6063,289.875 24.1063,289.875 Q24.8094,289.875 25.45,290.0313 Q26.1063,290.1875 26.6688,290.4844 L26.6688,293.2031 Q26.0438,292.625 25.45,292.3594 Q24.8563,292.0781 24.2313,292.0781 Q22.8875,292.0781 22.2,293.1563 Q21.5125,294.2188 21.5125,296.3125 Q21.5125,298.4063 22.2,299.4844 Q22.8875,300.5469 24.2313,300.5469 Q24.8563,300.5469 25.45,300.2813 Q26.0438,300 26.6688,299.4219 L26.6688,302.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="300.6543">Target1</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="312.5" y2="312.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="320.5" y2="320.5"/><ellipse cx="17" cy="331.5" 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="61" x="26" y="334.7104">m1() : void</text><ellipse cx="17" cy="344.3047" 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="61" x="26" y="347.5151">m2() : void</text><!--MD5=[783f698c423e798eb524ed3cee0aaa14]
+class C_0000000462--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="73.6094" id="C_0000000462" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="280.5"/><ellipse cx="431.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M434.6688,302.1406 Q434.0906,302.4375 433.45,302.5781 Q432.8094,302.7344 432.1063,302.7344 Q429.6063,302.7344 428.2781,301.0938 Q426.9656,299.4375 426.9656,296.3125 Q426.9656,293.1875 428.2781,291.5313 Q429.6063,289.875 432.1063,289.875 Q432.8094,289.875 433.45,290.0313 Q434.1063,290.1875 434.6688,290.4844 L434.6688,293.2031 Q434.0438,292.625 433.45,292.3594 Q432.8563,292.0781 432.2313,292.0781 Q430.8875,292.0781 430.2,293.1563 Q429.5125,294.2188 429.5125,296.3125 Q429.5125,298.4063 430.2,299.4844 Q430.8875,300.5469 432.2313,300.5469 Q432.8563,300.5469 433.45,300.2813 Q434.0438,300 434.6688,299.4219 L434.6688,302.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="300.6543">Target2</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="312.5" y2="312.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="320.5" y2="320.5"/><ellipse cx="425" cy="331.5" 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="61" x="434" y="334.7104">m1() : void</text><ellipse cx="425" cy="344.3047" 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="61" x="434" y="347.5151">m2() : void</text><!--MD5=[d2dee378c41ec582d027bf42207d54b0]
+class C_0000000464--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="99.2188" id="C_0000000464" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="373" y="265"/><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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="314.2104">m_target : std::shared_ptr&lt;T&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="320.8047" y2="320.8047"/><ellipse cx="139" cy="331.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" text-decoration="underline" textLength="225" x="148" y="335.0151">Proxy(std::shared_ptr&lt;T&gt; target) : void</text><ellipse cx="139" cy="344.6094" 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="61" x="148" y="347.8198">m1() : void</text><ellipse cx="139" cy="357.4141" 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="61" x="148" y="360.6245">m2() : void</text><!--MD5=[42e83dd12765435d8cd00a2f35878a16]
+class C_0000000469--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="48" id="C_0000000469" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="51" x="160.5" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="161.5" y="168.1387">Target1</text><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"/><!--MD5=[19c14efb460affb4a919201211ca6a75]
+class C_0000000470--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="48" id="C_0000000470" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="51" x="313.5" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="314.5" y="168.1387">Target2</text><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"/><!--MD5=[e6b0ff53f1f10e2f6c141b62045744b6]
+class C_0000000468--><rect fill="#FEFECE" filter="url(#fem6a6bbjbc1y)" height="73.6094" id="C_0000000468" 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"/><ellipse cx="152" cy="51" 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="143" x="161" y="54.2104">proxy1 : Proxy&lt;Target1&gt;</text><ellipse cx="152" cy="63.8047" 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="143" x="161" y="67.0151">proxy2 : Proxy&lt;Target2&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="73.6094" y2="73.6094"/><!--MD5=[ac01b11c757e02442843692d5f09f1ff]
+link C_0000000469 to C_0000000460--><path d="M132.08,207.08 C117.7,226.14 96.95,253.63 79.85,276.29 " fill="none" id="C_0000000469-&gt;C_0000000460" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="76.7,280.46,85.3109,275.6796,79.7091,276.4669,78.9219,270.865,76.7,280.46" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[77338a2e6d89570062d28cc7f6857aba]
+link C_0000000469 to C_0000000464--><path d="M167.62,207.08 C177.48,219.65 190.23,235.89 202.86,251.99 " fill="none" id="C_0000000469-&gt;C_0000000464" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="208.51,247.85,215.36,267.9,197.5,256.49,208.51,247.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[144d847f69f98461ed0efd7b7d25adb4]
+link C_0000000470 to C_0000000462--><path d="M329.5,207.08 C352.07,226.37 384.76,254.32 411.45,277.14 " fill="none" id="C_0000000470-&gt;C_0000000462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="415.34,280.46,411.0906,271.5751,411.5367,277.2143,405.8974,277.6604,415.34,280.46" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c67efd136745750e8587e95d10295f27]
+link C_0000000470 to C_0000000464--><path d="M293.96,207.08 C289.61,218.86 284.06,233.87 278.47,248.97 " fill="none" id="C_0000000470-&gt;C_0000000464" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="284.97,251.57,271.47,267.9,271.84,246.72,284.97,251.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2a545b23b629b55d4f2cf3e6828ae4bf]
+reverse link C_0000000468 to C_0000000469--><path d="M198.65,93.87 C195.23,99.97 191.78,106.13 188.5,112 C179.74,127.67 169.91,145.32 162.31,158.98 " fill="none" id="C_0000000468&lt;-C_0000000469" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="205.13,82.3,198.7072,85.5784,199.2631,92.768,205.6859,89.4896,205.13,82.3" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="194.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="201.5" y="125.0669">proxy1</text><!--MD5=[39d80fcfadd4138220040c0e4182892a]
+reverse link C_0000000468 to C_0000000470--><path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0000000468&lt;-C_0000000470" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="245.93,82.09,245.4025,89.2818,251.8382,92.5348,252.3657,85.343,245.93,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="276.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="283.5" y="125.0669">proxy2</text><!--MD5=[28854f9d8fee0a3217c5718e8b727d71]
 @startuml
-class "Target1" as C_0000000399
-class C_0000000399 {
+
+class "Target1" as C_0000000460
+class C_0000000460 {
 +m1() : void
 +m2() : void
 }
 
-class "Target2" as C_0000000401
-class C_0000000401 {
+class "Target2" as C_0000000462
+class C_0000000462 {
 +m1() : void
 +m2() : void
 }
 
-class "Proxy<T>" as C_0000000403
-class C_0000000403 {
+class "Proxy<T>" as C_0000000464
+class C_0000000464 {
 {static} +Proxy(std::shared_ptr<T> target) : void
 +m1() : void
 +m2() : void
 -m_target : std::shared_ptr<T>
 }
 
-class "Proxy<Target1>" as C_0000000408
-class C_0000000408 {
+class "Proxy<Target1>" as C_0000000469
+class C_0000000469 {
 }
 
-class "Proxy<Target2>" as C_0000000409
-class C_0000000409 {
+class "Proxy<Target2>" as C_0000000470
+class C_0000000470 {
 }
 
-class "ProxyHolder" as C_0000000407
-class C_0000000407 {
+class "ProxyHolder" as C_0000000468
+class C_0000000468 {
 +proxy1 : Proxy<Target1>
 +proxy2 : Proxy<Target2>
 }
 
-C_0000000408 ..> C_0000000399
-C_0000000408 ..|> C_0000000403
-C_0000000409 ..> C_0000000401
-C_0000000409 ..|> C_0000000403
-C_0000000407 o- - C_0000000408 : +proxy1
-C_0000000407 o- - C_0000000409 : +proxy2
+C_0000000469 ..> C_0000000460
+C_0000000469 ..|> C_0000000464
+C_0000000470 ..> C_0000000462
+C_0000000470 ..|> C_0000000464
+C_0000000468 o- - C_0000000469 : +proxy1
+C_0000000468 o- - C_0000000470 : +proxy2
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index ea464872..c5ad1cc0 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="567px" preserveAspectRatio="none" style="width:690px;height:567px;" version="1.1" viewBox="0 0 690 567" width="690px" zoomAndPan="magnify"><defs><filter height="300%" id="f6p0i0frr13d1" 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></defs><g><!--MD5=[914c5a0a4e3b2d42031ca3707c5012e1]
-class C_0000000413--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="86.4141" id="C_0000000413" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="180" y="470"/><ellipse cx="220.65" cy="486" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M223.6188,491.6406 Q223.0406,491.9375 222.4,492.0781 Q221.7594,492.2344 221.0563,492.2344 Q218.5563,492.2344 217.2281,490.5938 Q215.9156,488.9375 215.9156,485.8125 Q215.9156,482.6875 217.2281,481.0313 Q218.5563,479.375 221.0563,479.375 Q221.7594,479.375 222.4,479.5313 Q223.0563,479.6875 223.6188,479.9844 L223.6188,482.7031 Q222.9938,482.125 222.4,481.8594 Q221.8063,481.5781 221.1813,481.5781 Q219.8375,481.5781 219.15,482.6563 Q218.4625,483.7188 218.4625,485.8125 Q218.4625,487.9063 219.15,488.9844 Q219.8375,490.0469 221.1813,490.0469 Q221.8063,490.0469 222.4,489.7813 Q222.9938,489.5 223.6188,488.9219 L223.6188,491.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="240.35" y="490.1543">Memento</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="332" y="467"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="333" y="479.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="181" x2="337" y1="502" y2="502"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="188" y="510"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="516.2104">m_value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="181" x2="337" y1="522.8047" y2="522.8047"/><ellipse cx="191" cy="533.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" text-decoration="underline" textLength="132" x="200" y="537.0151">Memento(T&amp;&amp; v) : void</text><ellipse cx="191" cy="546.6094" 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="92" x="200" y="549.8198">value() const : T</text><!--MD5=[e52c8310835d3faf4754f2d8e86ebe6e]
-class C_0000000415--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="124.8281" id="C_0000000415" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="670.5" y="265"/><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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="314.2104">m_value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/><ellipse cx="442.5" cy="331.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" text-decoration="underline" textLength="137" x="451.5" y="335.0151">Originator(T&amp;&amp; v) : void</text><ellipse cx="442.5" cy="344.6094" 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="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text><ellipse cx="442.5" cy="357.4141" 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="204" x="451.5" y="360.6245">load(Memento&lt;T&gt; const&amp; m) : void</text><ellipse cx="442.5" cy="370.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="104" x="451.5" y="373.4292">print() const : void</text><ellipse cx="442.5" cy="383.0234" 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="98" x="451.5" y="386.2339">set(T&amp;&amp; v) : void</text><!--MD5=[5ad1fbd20f11b911a306eee28df61697]
-class C_0000000419--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="86.4141" id="C_0000000419" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/><ellipse cx="160.25" cy="303.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M163.2188,309.1406 Q162.6406,309.4375 162,309.5781 Q161.3594,309.7344 160.6563,309.7344 Q158.1563,309.7344 156.8281,308.0938 Q155.5156,306.4375 155.5156,303.3125 Q155.5156,300.1875 156.8281,298.5313 Q158.1563,296.875 160.6563,296.875 Q161.3594,296.875 162,297.0313 Q162.6563,297.1875 163.2188,297.4844 L163.2188,300.2031 Q162.5938,299.625 162,299.3594 Q161.4063,299.0781 160.7813,299.0781 Q159.4375,299.0781 158.75,300.1563 Q158.0625,301.2188 158.0625,303.3125 Q158.0625,305.4063 158.75,306.4844 Q159.4375,307.5469 160.7813,307.5469 Q161.4063,307.5469 162,307.2813 Q162.5938,307 163.2188,306.4219 L163.2188,309.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="307.6543">Caretaker</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="390" y="284.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="296.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="319.5" y2="319.5"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="327.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="333.7104">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="340.3047" y2="340.3047"/><ellipse cx="17" cy="351.3047" 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="251" x="26" y="354.5151">state(std::string const&amp; n) : Memento&lt;T&gt;&amp;</text><ellipse cx="17" cy="364.1094" 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="331" x="26" y="367.3198">set_state(std::string const&amp; s, Memento&lt;T&gt;&amp;&amp; m) : void</text><!--MD5=[491679034f5f78cb4966e891605efcb2]
-class C_0000000428--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="48" id="C_0000000428" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="338" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="339" y="168.1387">std::string</text><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"/><!--MD5=[fcd4056fa5f567bfbd35da2f5fe9e02b]
-class C_0000000429--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="48" id="C_0000000429" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="553" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="554" y="168.1387">std::string</text><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"/><!--MD5=[5cd79017113ec13f63264d490ce1fa37]
-class C_0000000427--><rect fill="#FEFECE" filter="url(#f6p0i0frr13d1)" height="73.6094" id="C_0000000427" 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"/><ellipse cx="313.5" cy="51" 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="199" x="322.5" y="54.2104">caretaker : Caretaker&lt;std::string&gt;</text><ellipse cx="313.5" cy="63.8047" 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="201" x="322.5" y="67.0151">originator : Originator&lt;std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="73.6094" y2="73.6094"/><!--MD5=[5736c39e67f1cc8813b1dcf20211edee]
-link C_0000000415 to C_0000000413--><path d="M453.3,393.11 C413.53,417.45 368.68,444.89 332.11,467.27 " fill="none" id="C_0000000415-&gt;C_0000000413" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="327.69,469.97,337.4545,468.6835,331.9546,467.3599,333.2783,461.86,327.69,469.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a51fcc12c679c6cdac03b2ecaad8cc67]
-link C_0000000419 to C_0000000413--><path d="M206.89,373.66 C210.4,394.04 215.64,418.65 223,440 C225.88,448.36 229.54,456.99 233.41,465.24 " fill="none" id="C_0000000419-&gt;C_0000000413" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="235.58,469.78,235.2966,459.9352,233.4187,465.2713,228.0826,463.3933,235.58,469.78" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[04f8886b17815a836f547efb1cec7bf7]
-reverse link C_0000000419 to C_0000000413--><path d="M218.69,386.54 C227.3,413.36 237.5,445.1 245.49,469.95 " fill="none" id="C_0000000419&lt;-C_0000000413" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="214.6,373.82,212.6303,380.7569,218.2759,385.2431,220.2457,378.3062,214.6,373.82" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="239" y="429.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="249" y="436.0669">m_mementos</text><!--MD5=[bfd73414f8a253509f4782a579e9f923]
-link C_0000000428 to C_0000000419--><path d="M300.3,207.05 C286.22,224.42 266.27,249.02 247.94,271.62 " fill="none" id="C_0000000428-&gt;C_0000000419" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="253.33,276.09,235.3,287.21,242.46,267.27,253.33,276.09" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[712a98ae52ca7f0661f2b33d20c303e0]
-link C_0000000429 to C_0000000415--><path d="M537.17,207.05 C538.74,218.48 540.74,233.03 542.81,248.08 " fill="none" id="C_0000000429-&gt;C_0000000415" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="549.75,247.18,545.54,267.94,535.88,249.08,549.75,247.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[43d0b62991336526faabc2c15eac980a]
-reverse link C_0000000427 to C_0000000428--><path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0000000427&lt;-C_0000000428" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="390.26,82.09,383.5206,84.6552,383.2964,91.8628,390.0358,89.2976,390.26,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="374" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="381" y="125.0669">caretaker</text><!--MD5=[ee6f6917b97ffd79114cf7b98f1b1efb]
-reverse link C_0000000427 to C_0000000429--><path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0000000427&lt;-C_0000000429" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="447.31,82.09,448.2152,89.2441,455.1672,91.16,454.2619,84.006,447.31,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="491" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="498" y="125.0669">originator</text><!--MD5=[6a0a4250469af5229b749a65dd4f04f5]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="567px" preserveAspectRatio="none" style="width:690px;height:567px;" version="1.1" viewBox="0 0 690 567" width="690px" zoomAndPan="magnify"><defs><filter height="300%" id="f1nhqcxgyqazij" 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></defs><g><!--MD5=[58d3784b51bf81cb5bfead003dd176d1]
+class C_0000000476--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="86.4141" id="C_0000000476" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="180" y="470"/><ellipse cx="220.65" cy="486" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M223.6188,491.6406 Q223.0406,491.9375 222.4,492.0781 Q221.7594,492.2344 221.0563,492.2344 Q218.5563,492.2344 217.2281,490.5938 Q215.9156,488.9375 215.9156,485.8125 Q215.9156,482.6875 217.2281,481.0313 Q218.5563,479.375 221.0563,479.375 Q221.7594,479.375 222.4,479.5313 Q223.0563,479.6875 223.6188,479.9844 L223.6188,482.7031 Q222.9938,482.125 222.4,481.8594 Q221.8063,481.5781 221.1813,481.5781 Q219.8375,481.5781 219.15,482.6563 Q218.4625,483.7188 218.4625,485.8125 Q218.4625,487.9063 219.15,488.9844 Q219.8375,490.0469 221.1813,490.0469 Q221.8063,490.0469 222.4,489.7813 Q222.9938,489.5 223.6188,488.9219 L223.6188,491.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="240.35" y="490.1543">Memento</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="332" y="467"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="333" y="479.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="181" x2="337" y1="502" y2="502"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="188" y="510"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="516.2104">m_value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="181" x2="337" y1="522.8047" y2="522.8047"/><ellipse cx="191" cy="533.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" text-decoration="underline" textLength="132" x="200" y="537.0151">Memento(T&amp;&amp; v) : void</text><ellipse cx="191" cy="546.6094" 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="92" x="200" y="549.8198">value() const : T</text><!--MD5=[3a77a3ac229b7f33d411214114b17040]
+class C_0000000478--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="124.8281" id="C_0000000478" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="670.5" y="265"/><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"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="308"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="314.2104">m_value : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/><ellipse cx="442.5" cy="331.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" text-decoration="underline" textLength="137" x="451.5" y="335.0151">Originator(T&amp;&amp; v) : void</text><ellipse cx="442.5" cy="344.6094" 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="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text><ellipse cx="442.5" cy="357.4141" 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="204" x="451.5" y="360.6245">load(Memento&lt;T&gt; const&amp; m) : void</text><ellipse cx="442.5" cy="370.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="104" x="451.5" y="373.4292">print() const : void</text><ellipse cx="442.5" cy="383.0234" 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="98" x="451.5" y="386.2339">set(T&amp;&amp; v) : void</text><!--MD5=[7d2085e85e0263d1cf617ea101ee2f09]
+class C_0000000482--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="86.4141" id="C_0000000482" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/><ellipse cx="160.25" cy="303.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M163.2188,309.1406 Q162.6406,309.4375 162,309.5781 Q161.3594,309.7344 160.6563,309.7344 Q158.1563,309.7344 156.8281,308.0938 Q155.5156,306.4375 155.5156,303.3125 Q155.5156,300.1875 156.8281,298.5313 Q158.1563,296.875 160.6563,296.875 Q161.3594,296.875 162,297.0313 Q162.6563,297.1875 163.2188,297.4844 L163.2188,300.2031 Q162.5938,299.625 162,299.3594 Q161.4063,299.0781 160.7813,299.0781 Q159.4375,299.0781 158.75,300.1563 Q158.0625,301.2188 158.0625,303.3125 Q158.0625,305.4063 158.75,306.4844 Q159.4375,307.5469 160.7813,307.5469 Q161.4063,307.5469 162,307.2813 Q162.5938,307 163.2188,306.4219 L163.2188,309.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="307.6543">Caretaker</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="390" y="284.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="296.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="319.5" y2="319.5"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="327.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="333.7104">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="340.3047" y2="340.3047"/><ellipse cx="17" cy="351.3047" 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="251" x="26" y="354.5151">state(std::string const&amp; n) : Memento&lt;T&gt;&amp;</text><ellipse cx="17" cy="364.1094" 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="331" x="26" y="367.3198">set_state(std::string const&amp; s, Memento&lt;T&gt;&amp;&amp; m) : void</text><!--MD5=[31f5a50c0c9112a90197b098e60f5a03]
+class C_0000000491--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="48" id="C_0000000491" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="338" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="339" y="168.1387">std::string</text><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"/><!--MD5=[d21f0ae6981ddb52f219b98990e52592]
+class C_0000000492--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="48" id="C_0000000492" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="553" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="554" y="168.1387">std::string</text><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"/><!--MD5=[2c688181d78908dc66f0488d10f8aed1]
+class C_0000000490--><rect fill="#FEFECE" filter="url(#f1nhqcxgyqazij)" height="73.6094" id="C_0000000490" 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"/><ellipse cx="313.5" cy="51" 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="199" x="322.5" y="54.2104">caretaker : Caretaker&lt;std::string&gt;</text><ellipse cx="313.5" cy="63.8047" 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="201" x="322.5" y="67.0151">originator : Originator&lt;std::string&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="73.6094" y2="73.6094"/><!--MD5=[90136c633dae05848ca9f39ba99dd3fc]
+link C_0000000478 to C_0000000476--><path d="M453.3,393.11 C413.53,417.45 368.68,444.89 332.11,467.27 " fill="none" id="C_0000000478-&gt;C_0000000476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="327.69,469.97,337.4545,468.6835,331.9546,467.3599,333.2783,461.86,327.69,469.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f1ae7a8ae4aa0799493ce9239fd792bc]
+link C_0000000482 to C_0000000476--><path d="M206.89,373.66 C210.4,394.04 215.64,418.65 223,440 C225.88,448.36 229.54,456.99 233.41,465.24 " fill="none" id="C_0000000482-&gt;C_0000000476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="235.58,469.78,235.2966,459.9352,233.4187,465.2713,228.0826,463.3933,235.58,469.78" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[19145e27e533e272f00c588b6afec12e]
+reverse link C_0000000482 to C_0000000476--><path d="M218.69,386.54 C227.3,413.36 237.5,445.1 245.49,469.95 " fill="none" id="C_0000000482&lt;-C_0000000476" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="214.6,373.82,212.6303,380.7569,218.2759,385.2431,220.2457,378.3062,214.6,373.82" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="239" y="429.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="249" y="436.0669">m_mementos</text><!--MD5=[9d71e003f65f13cbccec8d6e667f331a]
+link C_0000000491 to C_0000000482--><path d="M300.3,207.05 C286.22,224.42 266.27,249.02 247.94,271.62 " fill="none" id="C_0000000491-&gt;C_0000000482" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="253.33,276.09,235.3,287.21,242.46,267.27,253.33,276.09" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[42ddf6779aed54252b07805b4903b1ab]
+link C_0000000492 to C_0000000478--><path d="M537.17,207.05 C538.74,218.48 540.74,233.03 542.81,248.08 " fill="none" id="C_0000000492-&gt;C_0000000478" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="549.75,247.18,545.54,267.94,535.88,249.08,549.75,247.18" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[13c550a43f003f65c1be9de73b032de2]
+reverse link C_0000000490 to C_0000000491--><path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0000000490&lt;-C_0000000491" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="390.26,82.09,383.5206,84.6552,383.2964,91.8628,390.0358,89.2976,390.26,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="374" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="381" y="125.0669">caretaker</text><!--MD5=[3397dcf1c102e3743c2c79d485930b9e]
+reverse link C_0000000490 to C_0000000492--><path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0000000490&lt;-C_0000000492" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="447.31,82.09,448.2152,89.2441,455.1672,91.16,454.2619,84.006,447.31,82.09" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="491" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="498" y="125.0669">originator</text><!--MD5=[4ba45b9b5fb1ad697575f0e45cbbb3aa]
 @startuml
-class "Memento<T>" as C_0000000413
-class C_0000000413 {
+
+class "Memento<T>" as C_0000000476
+class C_0000000476 {
 {static} +Memento(T&& v) : void
 +value() const : T
 -m_value : T
 }
 
-class "Originator<T>" as C_0000000415
-class C_0000000415 {
+class "Originator<T>" as C_0000000478
+class C_0000000478 {
 {static} +Originator(T&& v) : void
 +memoize_value() const : Memento<T>
 +load(Memento<T> const& m) : void
@@ -30,34 +31,34 @@ class C_0000000415 {
 -m_value : T
 }
 
-class "Caretaker<T>" as C_0000000419
-class C_0000000419 {
+class "Caretaker<T>" as C_0000000482
+class C_0000000482 {
 +state(std::string const& n) : Memento<T>&
 +set_state(std::string const& s, Memento<T>&& m) : void
 -m_mementos : std::unordered_map<std::string,Memento<T>>
 }
 
-class "Caretaker<std::string>" as C_0000000428
-class C_0000000428 {
+class "Caretaker<std::string>" as C_0000000491
+class C_0000000491 {
 }
 
-class "Originator<std::string>" as C_0000000429
-class C_0000000429 {
+class "Originator<std::string>" as C_0000000492
+class C_0000000492 {
 }
 
-class "StringMemento" as C_0000000427
-class C_0000000427 {
+class "StringMemento" as C_0000000490
+class C_0000000490 {
 +caretaker : Caretaker<std::string>
 +originator : Originator<std::string>
 }
 
-C_0000000415 ..> C_0000000413
-C_0000000419 ..> C_0000000413
-C_0000000419 o- - C_0000000413 : -m_mementos
-C_0000000428 ..|> C_0000000419
-C_0000000429 ..|> C_0000000415
-C_0000000427 o- - C_0000000428 : +caretaker
-C_0000000427 o- - C_0000000429 : +originator
+C_0000000478 ..> C_0000000476
+C_0000000482 ..> C_0000000476
+C_0000000482 o- - C_0000000476 : -m_mementos
+C_0000000491 ..|> C_0000000482
+C_0000000492 ..|> C_0000000478
+C_0000000490 o- - C_0000000491 : +caretaker
+C_0000000490 o- - C_0000000492 : +originator
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index 2543f808..222ab061 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,95 +1,96 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:1053px;height:390px;" version="1.1" viewBox="0 0 1053 390" width="1053px" zoomAndPan="magnify"><defs><filter height="300%" id="f1j4z4ttutxlvv" 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></defs><g><!--MD5=[115d772377180ab5538d74a9a33817b5]
-class C_0000000433--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="73.6094" id="C_0000000433" style="stroke: #A80036; stroke-width: 1.5;" width="134" x="310.5" y="184"/><ellipse cx="353.4" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M353.5094,195.3438 L352.3531,200.4219 L354.6813,200.4219 L353.5094,195.3438 Z M352.025,193.1094 L355.0094,193.1094 L358.3688,205.5 L355.9156,205.5 L355.15,202.4375 L351.8688,202.4375 L351.1188,205.5 L348.6813,205.5 L352.025,193.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="373.6" y="204.1543">Shape</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="443.5" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="443.5" y1="224" y2="224"/><ellipse cx="321.5" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="238.2104">display() = 0 : void</text><ellipse cx="321.5" cy="247.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" text-decoration="underline" textLength="88" x="330.5" y="251.0151">~Shape() : void</text><!--MD5=[6ec0b6bc0afb379e95544936083dc825]
-class C_0000000435--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="60.8047" id="C_0000000435" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="319"/><ellipse cx="174.45" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M177.4188,340.6406 Q176.8406,340.9375 176.2,341.0781 Q175.5594,341.2344 174.8563,341.2344 Q172.3563,341.2344 171.0281,339.5938 Q169.7156,337.9375 169.7156,334.8125 Q169.7156,331.6875 171.0281,330.0313 Q172.3563,328.375 174.8563,328.375 Q175.5594,328.375 176.2,328.5313 Q176.8563,328.6875 177.4188,328.9844 L177.4188,331.7031 Q176.7938,331.125 176.2,330.8594 Q175.6063,330.5781 174.9813,330.5781 Q173.6375,330.5781 172.95,331.6563 Q172.2625,332.7188 172.2625,334.8125 Q172.2625,336.9063 172.95,337.9844 Q173.6375,339.0469 174.9813,339.0469 Q175.6063,339.0469 176.2,338.7813 Q176.7938,338.5 177.4188,337.9219 L177.4188,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="190.55" y="339.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="233" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="234" y="328.1387">T&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="351" y2="351"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/><ellipse cx="161" cy="370" 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="83" x="170" y="373.2104">display() : void</text><!--MD5=[ac63ae0432b4324cf7407e311968304a]
-class C_0000000437--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="60.8047" id="C_0000000437" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="496" y="319"/><ellipse cx="520" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M522.9688,340.6406 Q522.3906,340.9375 521.75,341.0781 Q521.1094,341.2344 520.4063,341.2344 Q517.9063,341.2344 516.5781,339.5938 Q515.2656,337.9375 515.2656,334.8125 Q515.2656,331.6875 516.5781,330.0313 Q517.9063,328.375 520.4063,328.375 Q521.1094,328.375 521.75,328.5313 Q522.4063,328.6875 522.9688,328.9844 L522.9688,331.7031 Q522.3438,331.125 521.75,330.8594 Q521.1563,330.5781 520.5313,330.5781 Q519.1875,330.5781 518.5,331.6563 Q517.8125,332.7188 517.8125,334.8125 Q517.8125,336.9063 518.5,337.9844 Q519.1875,339.0469 520.5313,339.0469 Q521.1563,339.0469 521.75,338.7813 Q522.3438,338.5 522.9688,337.9219 L522.9688,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="536" y="339.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="579" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="580" y="328.1387">T&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="604" y1="351" y2="351"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="604" y1="359" y2="359"/><ellipse cx="507" cy="370" 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="83" x="516" y="373.2104">display() : void</text><!--MD5=[c59dd78249bae84fb934d0e454794ce1]
-class C_0000000439--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="60.8047" id="C_0000000439" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="845" y="27"/><ellipse cx="860" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M860.1094,38.3438 L858.9531,43.4219 L861.2813,43.4219 L860.1094,38.3438 Z M858.625,36.1094 L861.6094,36.1094 L864.9688,48.5 L862.5156,48.5 L861.75,45.4375 L858.4688,45.4375 L857.7188,48.5 L855.2813,48.5 L858.625,36.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="874" y="47.1543">ShapeDecorator</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="846" x2="979" y1="59" y2="59"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="846" x2="979" y1="67" y2="67"/><ellipse cx="856" cy="78" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="865" y="81.2104">display() = 0 : void</text><!--MD5=[a53ef6ab5dfc1964ae0851cb96e5cb08]
-class C_0000000441--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="60.8047" id="C_0000000441" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="786" y="190.5"/><ellipse cx="816.3" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M819.2688,212.1406 Q818.6906,212.4375 818.05,212.5781 Q817.4094,212.7344 816.7063,212.7344 Q814.2063,212.7344 812.8781,211.0938 Q811.5656,209.4375 811.5656,206.3125 Q811.5656,203.1875 812.8781,201.5313 Q814.2063,199.875 816.7063,199.875 Q817.4094,199.875 818.05,200.0313 Q818.7063,200.1875 819.2688,200.4844 L819.2688,203.2031 Q818.6438,202.625 818.05,202.3594 Q817.4563,202.0781 816.8313,202.0781 Q815.4875,202.0781 814.8,203.1563 Q814.1125,204.2188 814.1125,206.3125 Q814.1125,208.4063 814.8,209.4844 Q815.4875,210.5469 816.8313,210.5469 Q817.4563,210.5469 818.05,210.2813 Q818.6438,210 819.2688,209.4219 L819.2688,212.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="833.7" y="210.6543">Color</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="889" y="187.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="890" y="199.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="894" y1="222.5" y2="222.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="894" y1="230.5" y2="230.5"/><ellipse cx="797" cy="241.5" 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="83" x="806" y="244.7104">display() : void</text><!--MD5=[8a0cce6337b3e25383360cb5bac95355]
-class C_0000000443--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="60.8047" id="C_0000000443" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="930" y="190.5"/><ellipse cx="955.35" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M958.3188,212.1406 Q957.7406,212.4375 957.1,212.5781 Q956.4594,212.7344 955.7563,212.7344 Q953.2563,212.7344 951.9281,211.0938 Q950.6156,209.4375 950.6156,206.3125 Q950.6156,203.1875 951.9281,201.5313 Q953.2563,199.875 955.7563,199.875 Q956.4594,199.875 957.1,200.0313 Q957.7563,200.1875 958.3188,200.4844 L958.3188,203.2031 Q957.6938,202.625 957.1,202.3594 Q956.5063,202.0781 955.8813,202.0781 Q954.5375,202.0781 953.85,203.1563 Q953.1625,204.2188 953.1625,206.3125 Q953.1625,208.4063 953.85,209.4844 Q954.5375,210.5469 955.8813,210.5469 Q956.5063,210.5469 957.1,210.2813 Q957.6938,210 958.3188,209.4219 L958.3188,212.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="971.65" y="210.6543">Weight</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1033" y="187.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1034" y="199.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="931" x2="1038" y1="222.5" y2="222.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="931" x2="1038" y1="230.5" y2="230.5"/><ellipse cx="941" cy="241.5" 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="83" x="950" y="244.7104">display() : void</text><!--MD5=[f47cfe07788ec5af2e641d4b5439f144]
-class C_0000000446--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="48" id="C_0000000446" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="197"/><ellipse cx="149" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M151.9688,218.6406 Q151.3906,218.9375 150.75,219.0781 Q150.1094,219.2344 149.4063,219.2344 Q146.9063,219.2344 145.5781,217.5938 Q144.2656,215.9375 144.2656,212.8125 Q144.2656,209.6875 145.5781,208.0313 Q146.9063,206.375 149.4063,206.375 Q150.1094,206.375 150.75,206.5313 Q151.4063,206.6875 151.9688,206.9844 L151.9688,209.7031 Q151.3438,209.125 150.75,208.8594 Q150.1563,208.5781 149.5313,208.5781 Q148.1875,208.5781 147.5,209.6563 Q146.8125,210.7188 146.8125,212.8125 Q146.8125,214.9063 147.5,215.9844 Q148.1875,217.0469 149.5313,217.0469 Q150.1563,217.0469 150.75,216.7813 Q151.3438,216.5 151.9688,215.9219 L151.9688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="217.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="196" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="197" y="206.1387">Color,Weight</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="237" y2="237"/><!--MD5=[8cef491ae44f614d821668551114313b]
-class C_0000000447--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="48" id="C_0000000447" style="stroke: #A80036; stroke-width: 1.5;" width="93" 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="25" x="35" y="217.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="68" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="206.1387">Color</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="237" y2="237"/><!--MD5=[2d8f87d529f619096345a1eaa4d93f5b]
-class C_0000000448--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="48" id="C_0000000448" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="479.5" y="197"/><ellipse cx="494.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M497.4688,218.6406 Q496.8906,218.9375 496.25,219.0781 Q495.6094,219.2344 494.9063,219.2344 Q492.4063,219.2344 491.0781,217.5938 Q489.7656,215.9375 489.7656,212.8125 Q489.7656,209.6875 491.0781,208.0313 Q492.4063,206.375 494.9063,206.375 Q495.6094,206.375 496.25,206.5313 Q496.9063,206.6875 497.4688,206.9844 L497.4688,209.7031 Q496.8438,209.125 496.25,208.8594 Q495.6563,208.5781 495.0313,208.5781 Q493.6875,208.5781 493,209.6563 Q492.3125,210.7188 492.3125,212.8125 Q492.3125,214.9063 493,215.9844 Q493.6875,217.0469 495.0313,217.0469 Q495.6563,217.0469 496.25,216.7813 Q496.8438,216.5 497.4688,215.9219 L497.4688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="508.5" y="217.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="542.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="543.5" y="206.1387">Color,Weight</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="480.5" x2="620.5" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="480.5" x2="620.5" y1="237" y2="237"/><!--MD5=[be703f52971956fdbf6637f1f732e3c7]
-class C_0000000449--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="48" id="C_0000000449" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="656.5" y="197"/><ellipse cx="671.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M674.4688,218.6406 Q673.8906,218.9375 673.25,219.0781 Q672.6094,219.2344 671.9063,219.2344 Q669.4063,219.2344 668.0781,217.5938 Q666.7656,215.9375 666.7656,212.8125 Q666.7656,209.6875 668.0781,208.0313 Q669.4063,206.375 671.9063,206.375 Q672.6094,206.375 673.25,206.5313 Q673.9063,206.6875 674.4688,206.9844 L674.4688,209.7031 Q673.8438,209.125 673.25,208.8594 Q672.6563,208.5781 672.0313,208.5781 Q670.6875,208.5781 670,209.6563 Q669.3125,210.7188 669.3125,212.8125 Q669.3125,214.9063 670,215.9844 Q670.6875,217.0469 672.0313,217.0469 Q672.6563,217.0469 673.25,216.7813 Q673.8438,216.5 674.4688,215.9219 L674.4688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="685.5" y="217.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="719.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="720.5" y="206.1387">Color</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="657.5" x2="749.5" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="657.5" x2="749.5" y1="237" y2="237"/><!--MD5=[ef1500840ae725d9e5af369fe09daf21]
-class C_0000000445--><rect fill="#FEFECE" filter="url(#f1j4z4ttutxlvv)" height="99.2188" id="C_0000000445" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="332.5" y="8"/><ellipse cx="398.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M401.7188,29.6406 Q401.1406,29.9375 400.5,30.0781 Q399.8594,30.2344 399.1563,30.2344 Q396.6563,30.2344 395.3281,28.5938 Q394.0156,26.9375 394.0156,23.8125 Q394.0156,20.6875 395.3281,19.0313 Q396.6563,17.375 399.1563,17.375 Q399.8594,17.375 400.5,17.5313 Q401.1563,17.6875 401.7188,17.9844 L401.7188,20.7031 Q401.0938,20.125 400.5,19.8594 Q399.9063,19.5781 399.2813,19.5781 Q397.9375,19.5781 397.25,20.6563 Q396.5625,21.7188 396.5625,23.8125 Q396.5625,25.9063 397.25,26.9844 Q397.9375,28.0469 399.2813,28.0469 Q399.9063,28.0469 400.5,27.7813 Q401.0938,27.5 401.7188,26.9219 L401.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="419.25" y="28.1543">Window</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="333.5" x2="519.5" y1="40" y2="40"/><ellipse cx="343.5" cy="51" 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="162" x="352.5" y="54.2104">border : Line&lt;Color,Weight&gt;</text><ellipse cx="343.5" cy="63.8047" 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="121" x="352.5" y="67.0151">divider : Line&lt;Color&gt;</text><ellipse cx="343.5" cy="76.6094" 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="146" x="352.5" y="79.8198">title : Text&lt;Color,Weight&gt;</text><ellipse cx="343.5" cy="89.4141" 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="147" x="352.5" y="92.6245">description : Text&lt;Color&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="333.5" x2="519.5" y1="99.2188" y2="99.2188"/><!--MD5=[b1976fd228f006d9e6cf8e4f480c0bc3]
-reverse link C_0000000433 to C_0000000435--><path d="M311.67,270.14 C289.26,286.52 264.88,304.35 245.05,318.85 " fill="none" id="C_0000000433&lt;-C_0000000435" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="307.65,264.4,327.93,258.25,315.91,275.71,307.65,264.4" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9d9c935422d38f92427a3315f2603085]
-reverse link C_0000000433 to C_0000000437--><path d="M443.33,270.14 C465.74,286.52 490.12,304.35 509.95,318.85 " fill="none" id="C_0000000433&lt;-C_0000000437" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="439.09,275.71,427.07,258.25,447.35,264.4,439.09,275.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[85798462cf4bdabd4f235cda89e0c071]
-reverse link C_0000000439 to C_0000000441--><path d="M891.04,106.64 C878.93,133.8 864.18,166.89 853.74,190.29 " fill="none" id="C_0000000439&lt;-C_0000000441" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="884.76,103.54,899.29,88.12,897.54,109.24,884.76,103.54" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a4a47ef2d5dccfcc30f798d1491490d4]
-reverse link C_0000000439 to C_0000000443--><path d="M933.96,106.64 C946.07,133.8 960.82,166.89 971.26,190.29 " fill="none" id="C_0000000439&lt;-C_0000000443" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="927.46,109.24,925.71,88.12,940.24,103.54,927.46,109.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5b8f4c7553ce418d01652328fcc5526a]
-link C_0000000446 to C_0000000435--><path d="M204.5,245.2 C204.5,260.15 204.5,280.17 204.5,298.6 " fill="none" id="C_0000000446-&gt;C_0000000435" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="211.5,298.75,204.5,318.75,197.5,298.75,211.5,298.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9cf4c097dfe6de08ee707014e585f010]
-link C_0000000447 to C_0000000435--><path d="M80.38,245.2 C100.84,262.23 129.2,285.83 153.65,306.18 " fill="none" id="C_0000000447-&gt;C_0000000435" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="158.13,300.8,169.03,318.98,149.18,311.57,158.13,300.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6bc827c9f425a8716a0323599b226f43]
-link C_0000000448 to C_0000000437--><path d="M550.5,245.2 C550.5,260.15 550.5,280.17 550.5,298.6 " fill="none" id="C_0000000448-&gt;C_0000000437" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="557.5,298.75,550.5,318.75,543.5,298.75,557.5,298.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3dd61c985d57bc1edaa64a8b27985a39]
-link C_0000000449 to C_0000000437--><path d="M675.44,245.2 C654.84,262.23 626.3,285.83 601.69,306.18 " fill="none" id="C_0000000449-&gt;C_0000000437" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="606.08,311.63,586.21,318.98,597.16,300.84,606.08,311.63" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[de233ef56e8d0e5a2b867c5724e1b03f]
-reverse link C_0000000445 to C_0000000446--><path d="M348.87,114.98 C310.22,143.09 265.62,175.54 236.34,196.84 " fill="none" id="C_0000000445&lt;-C_0000000446" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="359.59,107.17,352.3851,107.4687,349.8897,114.2343,357.0946,113.9356,359.59,107.17" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="321.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="328.5" y="150.0669">border</text><!--MD5=[ed9893efe69e7427a99920b9e719cbe4]
-reverse link C_0000000445 to C_0000000447--><path d="M319.96,97.75 C259.47,120.99 182.82,152.07 116.5,184 C108.34,187.93 99.79,192.44 91.69,196.92 " fill="none" id="C_0000000445&lt;-C_0000000447" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="332.23,93.06,325.1971,91.4666,321.0214,97.3456,328.0542,98.939,332.23,93.06" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="223.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="230.5" y="150.0669">divider</text><!--MD5=[2af888572c944c0f1968a6746c96da65]
-reverse link C_0000000445 to C_0000000448--><path d="M471.97,117.72 C493.08,145.21 516.94,176.29 532.77,196.9 " fill="none" id="C_0000000445&lt;-C_0000000448" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="464.04,107.39,464.5254,114.5847,471.3533,116.9039,470.868,109.7092,464.04,107.39" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="506.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="513.5" y="150.0669">title</text><!--MD5=[8c55f9bbe7d471393352548e441001c1]
-reverse link C_0000000445 to C_0000000449--><path d="M521.52,113.9 C570.16,142.26 626.77,175.27 663.78,196.84 " fill="none" id="C_0000000445&lt;-C_0000000449" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="509.98,107.17,513.1441,113.6498,520.3425,113.2214,517.1784,106.7415,509.98,107.17" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="596.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="603.5" y="150.0669">description</text><!--MD5=[e0e9db0189533c5f8deb69730e09ae97]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:1053px;height:390px;" version="1.1" viewBox="0 0 1053 390" width="1053px" zoomAndPan="magnify"><defs><filter height="300%" id="f16pbo9z0vj14g" 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></defs><g><!--MD5=[bd23214d7bdbce8a288df380ba724c09]
+class C_0000000498--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="73.6094" id="C_0000000498" style="stroke: #A80036; stroke-width: 1.5;" width="134" x="310.5" y="184"/><ellipse cx="353.4" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M353.5094,195.3438 L352.3531,200.4219 L354.6813,200.4219 L353.5094,195.3438 Z M352.025,193.1094 L355.0094,193.1094 L358.3688,205.5 L355.9156,205.5 L355.15,202.4375 L351.8688,202.4375 L351.1188,205.5 L348.6813,205.5 L352.025,193.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="373.6" y="204.1543">Shape</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="443.5" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="443.5" y1="224" y2="224"/><ellipse cx="321.5" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="238.2104">display() = 0 : void</text><ellipse cx="321.5" cy="247.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" text-decoration="underline" textLength="88" x="330.5" y="251.0151">~Shape() : void</text><!--MD5=[e147a2dbcd65a7ae3ad72b8a968d901f]
+class C_0000000500--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="60.8047" id="C_0000000500" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="319"/><ellipse cx="174.45" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M177.4188,340.6406 Q176.8406,340.9375 176.2,341.0781 Q175.5594,341.2344 174.8563,341.2344 Q172.3563,341.2344 171.0281,339.5938 Q169.7156,337.9375 169.7156,334.8125 Q169.7156,331.6875 171.0281,330.0313 Q172.3563,328.375 174.8563,328.375 Q175.5594,328.375 176.2,328.5313 Q176.8563,328.6875 177.4188,328.9844 L177.4188,331.7031 Q176.7938,331.125 176.2,330.8594 Q175.6063,330.5781 174.9813,330.5781 Q173.6375,330.5781 172.95,331.6563 Q172.2625,332.7188 172.2625,334.8125 Q172.2625,336.9063 172.95,337.9844 Q173.6375,339.0469 174.9813,339.0469 Q175.6063,339.0469 176.2,338.7813 Q176.7938,338.5 177.4188,337.9219 L177.4188,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="190.55" y="339.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="233" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="234" y="328.1387">T&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="351" y2="351"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/><ellipse cx="161" cy="370" 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="83" x="170" y="373.2104">display() : void</text><!--MD5=[2fedc95f0afe19bf114c2ed53b81382b]
+class C_0000000502--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="60.8047" id="C_0000000502" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="496" y="319"/><ellipse cx="520" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M522.9688,340.6406 Q522.3906,340.9375 521.75,341.0781 Q521.1094,341.2344 520.4063,341.2344 Q517.9063,341.2344 516.5781,339.5938 Q515.2656,337.9375 515.2656,334.8125 Q515.2656,331.6875 516.5781,330.0313 Q517.9063,328.375 520.4063,328.375 Q521.1094,328.375 521.75,328.5313 Q522.4063,328.6875 522.9688,328.9844 L522.9688,331.7031 Q522.3438,331.125 521.75,330.8594 Q521.1563,330.5781 520.5313,330.5781 Q519.1875,330.5781 518.5,331.6563 Q517.8125,332.7188 517.8125,334.8125 Q517.8125,336.9063 518.5,337.9844 Q519.1875,339.0469 520.5313,339.0469 Q521.1563,339.0469 521.75,338.7813 Q522.3438,338.5 522.9688,337.9219 L522.9688,340.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="536" y="339.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="579" y="316"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="580" y="328.1387">T&lt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="604" y1="351" y2="351"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="604" y1="359" y2="359"/><ellipse cx="507" cy="370" 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="83" x="516" y="373.2104">display() : void</text><!--MD5=[1b24f9e3b5522795d811fe1cc372b8bd]
+class C_0000000504--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="60.8047" id="C_0000000504" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="845" y="27"/><ellipse cx="860" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M860.1094,38.3438 L858.9531,43.4219 L861.2813,43.4219 L860.1094,38.3438 Z M858.625,36.1094 L861.6094,36.1094 L864.9688,48.5 L862.5156,48.5 L861.75,45.4375 L858.4688,45.4375 L857.7188,48.5 L855.2813,48.5 L858.625,36.1094 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="874" y="47.1543">ShapeDecorator</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="846" x2="979" y1="59" y2="59"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="846" x2="979" y1="67" y2="67"/><ellipse cx="856" cy="78" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="865" y="81.2104">display() = 0 : void</text><!--MD5=[3b145d04ab3da75d25cbf49437794bab]
+class C_0000000506--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="60.8047" id="C_0000000506" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="786" y="190.5"/><ellipse cx="816.3" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M819.2688,212.1406 Q818.6906,212.4375 818.05,212.5781 Q817.4094,212.7344 816.7063,212.7344 Q814.2063,212.7344 812.8781,211.0938 Q811.5656,209.4375 811.5656,206.3125 Q811.5656,203.1875 812.8781,201.5313 Q814.2063,199.875 816.7063,199.875 Q817.4094,199.875 818.05,200.0313 Q818.7063,200.1875 819.2688,200.4844 L819.2688,203.2031 Q818.6438,202.625 818.05,202.3594 Q817.4563,202.0781 816.8313,202.0781 Q815.4875,202.0781 814.8,203.1563 Q814.1125,204.2188 814.1125,206.3125 Q814.1125,208.4063 814.8,209.4844 Q815.4875,210.5469 816.8313,210.5469 Q817.4563,210.5469 818.05,210.2813 Q818.6438,210 819.2688,209.4219 L819.2688,212.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="833.7" y="210.6543">Color</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="889" y="187.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="890" y="199.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="894" y1="222.5" y2="222.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="894" y1="230.5" y2="230.5"/><ellipse cx="797" cy="241.5" 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="83" x="806" y="244.7104">display() : void</text><!--MD5=[cff317936a0bab78aad4fee7d4738bbc]
+class C_0000000508--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="60.8047" id="C_0000000508" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="930" y="190.5"/><ellipse cx="955.35" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M958.3188,212.1406 Q957.7406,212.4375 957.1,212.5781 Q956.4594,212.7344 955.7563,212.7344 Q953.2563,212.7344 951.9281,211.0938 Q950.6156,209.4375 950.6156,206.3125 Q950.6156,203.1875 951.9281,201.5313 Q953.2563,199.875 955.7563,199.875 Q956.4594,199.875 957.1,200.0313 Q957.7563,200.1875 958.3188,200.4844 L958.3188,203.2031 Q957.6938,202.625 957.1,202.3594 Q956.5063,202.0781 955.8813,202.0781 Q954.5375,202.0781 953.85,203.1563 Q953.1625,204.2188 953.1625,206.3125 Q953.1625,208.4063 953.85,209.4844 Q954.5375,210.5469 955.8813,210.5469 Q956.5063,210.5469 957.1,210.2813 Q957.6938,210 958.3188,209.4219 L958.3188,212.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="971.65" y="210.6543">Weight</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1033" y="187.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1034" y="199.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="931" x2="1038" y1="222.5" y2="222.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="931" x2="1038" y1="230.5" y2="230.5"/><ellipse cx="941" cy="241.5" 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="83" x="950" y="244.7104">display() : void</text><!--MD5=[eb4c6ceda3f0fd9865c47edf3825a62e]
+class C_0000000511--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="48" id="C_0000000511" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="197"/><ellipse cx="149" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M151.9688,218.6406 Q151.3906,218.9375 150.75,219.0781 Q150.1094,219.2344 149.4063,219.2344 Q146.9063,219.2344 145.5781,217.5938 Q144.2656,215.9375 144.2656,212.8125 Q144.2656,209.6875 145.5781,208.0313 Q146.9063,206.375 149.4063,206.375 Q150.1094,206.375 150.75,206.5313 Q151.4063,206.6875 151.9688,206.9844 L151.9688,209.7031 Q151.3438,209.125 150.75,208.8594 Q150.1563,208.5781 149.5313,208.5781 Q148.1875,208.5781 147.5,209.6563 Q146.8125,210.7188 146.8125,212.8125 Q146.8125,214.9063 147.5,215.9844 Q148.1875,217.0469 149.5313,217.0469 Q150.1563,217.0469 150.75,216.7813 Q151.3438,216.5 151.9688,215.9219 L151.9688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="217.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="196" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="197" y="206.1387">Color,Weight</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="237" y2="237"/><!--MD5=[dd851d2c051e2a43e6e6875894221c54]
+class C_0000000512--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="48" id="C_0000000512" style="stroke: #A80036; stroke-width: 1.5;" width="93" 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="25" x="35" y="217.1543">Line</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="68" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="206.1387">Color</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="237" y2="237"/><!--MD5=[03acb8262bb78994b45615abe8c98c20]
+class C_0000000513--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="48" id="C_0000000513" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="479.5" y="197"/><ellipse cx="494.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M497.4688,218.6406 Q496.8906,218.9375 496.25,219.0781 Q495.6094,219.2344 494.9063,219.2344 Q492.4063,219.2344 491.0781,217.5938 Q489.7656,215.9375 489.7656,212.8125 Q489.7656,209.6875 491.0781,208.0313 Q492.4063,206.375 494.9063,206.375 Q495.6094,206.375 496.25,206.5313 Q496.9063,206.6875 497.4688,206.9844 L497.4688,209.7031 Q496.8438,209.125 496.25,208.8594 Q495.6563,208.5781 495.0313,208.5781 Q493.6875,208.5781 493,209.6563 Q492.3125,210.7188 492.3125,212.8125 Q492.3125,214.9063 493,215.9844 Q493.6875,217.0469 495.0313,217.0469 Q495.6563,217.0469 496.25,216.7813 Q496.8438,216.5 497.4688,215.9219 L497.4688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="508.5" y="217.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="542.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="543.5" y="206.1387">Color,Weight</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="480.5" x2="620.5" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="480.5" x2="620.5" y1="237" y2="237"/><!--MD5=[4dbc840266ba1ea0b3eb9068a368ed5c]
+class C_0000000514--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="48" id="C_0000000514" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="656.5" y="197"/><ellipse cx="671.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M674.4688,218.6406 Q673.8906,218.9375 673.25,219.0781 Q672.6094,219.2344 671.9063,219.2344 Q669.4063,219.2344 668.0781,217.5938 Q666.7656,215.9375 666.7656,212.8125 Q666.7656,209.6875 668.0781,208.0313 Q669.4063,206.375 671.9063,206.375 Q672.6094,206.375 673.25,206.5313 Q673.9063,206.6875 674.4688,206.9844 L674.4688,209.7031 Q673.8438,209.125 673.25,208.8594 Q672.6563,208.5781 672.0313,208.5781 Q670.6875,208.5781 670,209.6563 Q669.3125,210.7188 669.3125,212.8125 Q669.3125,214.9063 670,215.9844 Q670.6875,217.0469 672.0313,217.0469 Q672.6563,217.0469 673.25,216.7813 Q673.8438,216.5 674.4688,215.9219 L674.4688,218.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="685.5" y="217.1543">Text</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="719.5" y="194"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="720.5" y="206.1387">Color</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="657.5" x2="749.5" y1="229" y2="229"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="657.5" x2="749.5" y1="237" y2="237"/><!--MD5=[9a6aa1585f2aef5054714f8b6cfcf91e]
+class C_0000000510--><rect fill="#FEFECE" filter="url(#f16pbo9z0vj14g)" height="99.2188" id="C_0000000510" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="332.5" y="8"/><ellipse cx="398.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M401.7188,29.6406 Q401.1406,29.9375 400.5,30.0781 Q399.8594,30.2344 399.1563,30.2344 Q396.6563,30.2344 395.3281,28.5938 Q394.0156,26.9375 394.0156,23.8125 Q394.0156,20.6875 395.3281,19.0313 Q396.6563,17.375 399.1563,17.375 Q399.8594,17.375 400.5,17.5313 Q401.1563,17.6875 401.7188,17.9844 L401.7188,20.7031 Q401.0938,20.125 400.5,19.8594 Q399.9063,19.5781 399.2813,19.5781 Q397.9375,19.5781 397.25,20.6563 Q396.5625,21.7188 396.5625,23.8125 Q396.5625,25.9063 397.25,26.9844 Q397.9375,28.0469 399.2813,28.0469 Q399.9063,28.0469 400.5,27.7813 Q401.0938,27.5 401.7188,26.9219 L401.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="419.25" y="28.1543">Window</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="333.5" x2="519.5" y1="40" y2="40"/><ellipse cx="343.5" cy="51" 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="162" x="352.5" y="54.2104">border : Line&lt;Color,Weight&gt;</text><ellipse cx="343.5" cy="63.8047" 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="121" x="352.5" y="67.0151">divider : Line&lt;Color&gt;</text><ellipse cx="343.5" cy="76.6094" 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="146" x="352.5" y="79.8198">title : Text&lt;Color,Weight&gt;</text><ellipse cx="343.5" cy="89.4141" 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="147" x="352.5" y="92.6245">description : Text&lt;Color&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="333.5" x2="519.5" y1="99.2188" y2="99.2188"/><!--MD5=[625ae08339e11f297b0b64d287f8ee29]
+reverse link C_0000000498 to C_0000000500--><path d="M311.67,270.14 C289.26,286.52 264.88,304.35 245.05,318.85 " fill="none" id="C_0000000498&lt;-C_0000000500" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="307.65,264.4,327.93,258.25,315.91,275.71,307.65,264.4" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a343f8a1a478f9d493b2dc80af8cf21c]
+reverse link C_0000000498 to C_0000000502--><path d="M443.33,270.14 C465.74,286.52 490.12,304.35 509.95,318.85 " fill="none" id="C_0000000498&lt;-C_0000000502" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="439.09,275.71,427.07,258.25,447.35,264.4,439.09,275.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[fffc545fed155b988370d0035c47b977]
+reverse link C_0000000504 to C_0000000506--><path d="M891.04,106.64 C878.93,133.8 864.18,166.89 853.74,190.29 " fill="none" id="C_0000000504&lt;-C_0000000506" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="884.76,103.54,899.29,88.12,897.54,109.24,884.76,103.54" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4692b58d8807a688992957adbade9a5c]
+reverse link C_0000000504 to C_0000000508--><path d="M933.96,106.64 C946.07,133.8 960.82,166.89 971.26,190.29 " fill="none" id="C_0000000504&lt;-C_0000000508" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="927.46,109.24,925.71,88.12,940.24,103.54,927.46,109.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[83151fb5b1532e73e8b12fa5d1f45667]
+link C_0000000511 to C_0000000500--><path d="M204.5,245.2 C204.5,260.15 204.5,280.17 204.5,298.6 " fill="none" id="C_0000000511-&gt;C_0000000500" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="211.5,298.75,204.5,318.75,197.5,298.75,211.5,298.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2ca723be6bd9bcb35131056dcbc2c764]
+link C_0000000512 to C_0000000500--><path d="M80.38,245.2 C100.84,262.23 129.2,285.83 153.65,306.18 " fill="none" id="C_0000000512-&gt;C_0000000500" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="158.13,300.8,169.03,318.98,149.18,311.57,158.13,300.8" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[07cf55da8c430f71a55e96ba312cce56]
+link C_0000000513 to C_0000000502--><path d="M550.5,245.2 C550.5,260.15 550.5,280.17 550.5,298.6 " fill="none" id="C_0000000513-&gt;C_0000000502" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="557.5,298.75,550.5,318.75,543.5,298.75,557.5,298.75" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f784935a401de6b9bcf7bb25396299bb]
+link C_0000000514 to C_0000000502--><path d="M675.44,245.2 C654.84,262.23 626.3,285.83 601.69,306.18 " fill="none" id="C_0000000514-&gt;C_0000000502" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="606.08,311.63,586.21,318.98,597.16,300.84,606.08,311.63" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4cd4d92bc9d390ea5e3f8ea8b58c3d0e]
+reverse link C_0000000510 to C_0000000511--><path d="M348.87,114.98 C310.22,143.09 265.62,175.54 236.34,196.84 " fill="none" id="C_0000000510&lt;-C_0000000511" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="359.59,107.17,352.3851,107.4687,349.8897,114.2343,357.0946,113.9356,359.59,107.17" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="321.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="328.5" y="150.0669">border</text><!--MD5=[498974e06d4fb6635955bdd2919422ad]
+reverse link C_0000000510 to C_0000000512--><path d="M319.96,97.75 C259.47,120.99 182.82,152.07 116.5,184 C108.34,187.93 99.79,192.44 91.69,196.92 " fill="none" id="C_0000000510&lt;-C_0000000512" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="332.23,93.06,325.1971,91.4666,321.0214,97.3456,328.0542,98.939,332.23,93.06" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="223.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="230.5" y="150.0669">divider</text><!--MD5=[59d97b7af00468042e95fa7a0a25438b]
+reverse link C_0000000510 to C_0000000513--><path d="M471.97,117.72 C493.08,145.21 516.94,176.29 532.77,196.9 " fill="none" id="C_0000000510&lt;-C_0000000513" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="464.04,107.39,464.5254,114.5847,471.3533,116.9039,470.868,109.7092,464.04,107.39" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="506.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="513.5" y="150.0669">title</text><!--MD5=[f9a978d6d7a1f23b3de750a6b8066fbb]
+reverse link C_0000000510 to C_0000000514--><path d="M521.52,113.9 C570.16,142.26 626.77,175.27 663.78,196.84 " fill="none" id="C_0000000510&lt;-C_0000000514" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="509.98,107.17,513.1441,113.6498,520.3425,113.2214,517.1784,106.7415,509.98,107.17" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="596.5" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="603.5" y="150.0669">description</text><!--MD5=[6510d08441582f2359aaa98adbf09035]
 @startuml
-abstract "Shape" as C_0000000433
-abstract C_0000000433 {
+
+abstract "Shape" as C_0000000498
+abstract C_0000000498 {
 {abstract} +display() = 0 : void
 {static} +~Shape() : void
 }
 
-class "Line<T<>>" as C_0000000435
-class C_0000000435 {
+class "Line<T<>>" as C_0000000500
+class C_0000000500 {
 +display() : void
 }
-C_0000000433 <|- - C_0000000435
 
-class "Text<T<>>" as C_0000000437
-class C_0000000437 {
+class "Text<T<>>" as C_0000000502
+class C_0000000502 {
 +display() : void
 }
-C_0000000433 <|- - C_0000000437
 
-abstract "ShapeDecorator" as C_0000000439
-abstract C_0000000439 {
+abstract "ShapeDecorator" as C_0000000504
+abstract C_0000000504 {
 {abstract} +display() = 0 : void
 }
 
-class "Color<T>" as C_0000000441
-class C_0000000441 {
+class "Color<T>" as C_0000000506
+class C_0000000506 {
 +display() : void
 }
-C_0000000439 <|- - C_0000000441
 
-class "Weight<T>" as C_0000000443
-class C_0000000443 {
+class "Weight<T>" as C_0000000508
+class C_0000000508 {
 +display() : void
 }
-C_0000000439 <|- - C_0000000443
 
-class "Line<Color,Weight>" as C_0000000446
-class C_0000000446 {
+class "Line<Color,Weight>" as C_0000000511
+class C_0000000511 {
 }
 
-class "Line<Color>" as C_0000000447
-class C_0000000447 {
+class "Line<Color>" as C_0000000512
+class C_0000000512 {
 }
 
-class "Text<Color,Weight>" as C_0000000448
-class C_0000000448 {
+class "Text<Color,Weight>" as C_0000000513
+class C_0000000513 {
 }
 
-class "Text<Color>" as C_0000000449
-class C_0000000449 {
+class "Text<Color>" as C_0000000514
+class C_0000000514 {
 }
 
-class "Window" as C_0000000445
-class C_0000000445 {
+class "Window" as C_0000000510
+class C_0000000510 {
 +border : Line<Color,Weight>
 +divider : Line<Color>
 +title : Text<Color,Weight>
 +description : Text<Color>
 }
 
-C_0000000446 ..|> C_0000000435
-C_0000000447 ..|> C_0000000435
-C_0000000448 ..|> C_0000000437
-C_0000000449 ..|> C_0000000437
-C_0000000445 o- - C_0000000446 : +border
-C_0000000445 o- - C_0000000447 : +divider
-C_0000000445 o- - C_0000000448 : +title
-C_0000000445 o- - C_0000000449 : +description
+C_0000000498 <|- - C_0000000500
+C_0000000498 <|- - C_0000000502
+C_0000000504 <|- - C_0000000506
+C_0000000504 <|- - C_0000000508
+C_0000000511 ..|> C_0000000500
+C_0000000512 ..|> C_0000000500
+C_0000000513 ..|> C_0000000502
+C_0000000514 ..|> C_0000000502
+C_0000000510 o- - C_0000000511 : +border
+C_0000000510 o- - C_0000000512 : +divider
+C_0000000510 o- - C_0000000513 : +title
+C_0000000510 o- - C_0000000514 : +description
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index 5c0eb476..87c260c5 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,100 +1,101 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="435px" preserveAspectRatio="none" style="width:1416px;height:435px;" version="1.1" viewBox="0 0 1416 435" width="1416px" zoomAndPan="magnify"><defs><filter height="300%" id="fqcawhn7d8z3n" 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></defs><g><!--MD5=[f3d937a5bfb69d4894d18a7fdbde33e3]
-class C_0000000455--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000455" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1082.5" y="251.5"/><ellipse cx="1097.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1100.4688,273.1406 Q1099.8906,273.4375 1099.25,273.5781 Q1098.6094,273.7344 1097.9063,273.7344 Q1095.4063,273.7344 1094.0781,272.0938 Q1092.7656,270.4375 1092.7656,267.3125 Q1092.7656,264.1875 1094.0781,262.5313 Q1095.4063,260.875 1097.9063,260.875 Q1098.6094,260.875 1099.25,261.0313 Q1099.9063,261.1875 1100.4688,261.4844 L1100.4688,264.2031 Q1099.8438,263.625 1099.25,263.3594 Q1098.6563,263.0781 1098.0313,263.0781 Q1096.6875,263.0781 1096,264.1563 Q1095.3125,265.2188 1095.3125,267.3125 Q1095.3125,269.4063 1096,270.4844 Q1096.6875,271.5469 1098.0313,271.5469 Q1098.6563,271.5469 1099.25,271.2813 Q1099.8438,271 1100.4688,270.4219 L1100.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1111.5" y="271.6543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1083.5" x2="1121.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="1083.5" x2="1121.5" y1="291.5" y2="291.5"/><path d="M946,89.5 L946,114.6328 A0,0 0 0 0 946,114.6328 L1000.55,114.6328 L1088.37,251.42 L1008.55,114.6328 L1049,114.6328 A0,0 0 0 0 1049,114.6328 L1049,99.5 L1039,89.5 L946,89.5 A0,0 0 0 0 946,89.5 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1039,89.5 L1039,99.5 L1049,99.5 L1039,89.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="952" y="106.5669">A class note.</text><path d="M1084,89.5 L1084,114.6328 A0,0 0 0 0 1084,114.6328 L1129.28,114.6328 L1106.94,251.42 L1137.28,114.6328 L1187,114.6328 A0,0 0 0 0 1187,114.6328 L1187,99.5 L1177,89.5 L1084,89.5 A0,0 0 0 0 1084,89.5 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1177,89.5 L1177,99.5 L1187,99.5 L1177,89.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="1090" y="106.5669">A class note.</text><!--MD5=[9806510cc60d79a3fc3517a3b52d7fde]
-class C_0000000457--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000457" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="752.5" y="251.5"/><ellipse cx="767.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M770.4688,273.1406 Q769.8906,273.4375 769.25,273.5781 Q768.6094,273.7344 767.9063,273.7344 Q765.4063,273.7344 764.0781,272.0938 Q762.7656,270.4375 762.7656,267.3125 Q762.7656,264.1875 764.0781,262.5313 Q765.4063,260.875 767.9063,260.875 Q768.6094,260.875 769.25,261.0313 Q769.9063,261.1875 770.4688,261.4844 L770.4688,264.2031 Q769.8438,263.625 769.25,263.3594 Q768.6563,263.0781 768.0313,263.0781 Q766.6875,263.0781 766,264.1563 Q765.3125,265.2188 765.3125,267.3125 Q765.3125,269.4063 766,270.4844 Q766.6875,271.5469 768.0313,271.5469 Q768.6563,271.5469 769.25,271.2813 Q769.8438,271 770.4688,270.4219 L770.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="781.5" y="271.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="791.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="791.5" y1="291.5" y2="291.5"/><path d="M476,263 L476,288.1328 L579,288.1328 L579,273 L569,263 L476,263 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M569,263 L569,273 L579,273 L569,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="482" y="280.0669">B class note.</text><path d="M614,263 L614,288.1328 A0,0 0 0 0 614,288.1328 L717,288.1328 A0,0 0 0 0 717,288.1328 L717,281 L752.24,275.5 L717,273 L717,273 L707,263 L614,263 A0,0 0 0 0 614,263 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M707,263 L707,273 L717,273 L707,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="620" y="280.0669">B class note.</text><!--MD5=[6adfc7c4d3f8088201f9db709d3f11fc]
-class C_0000000459--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000459" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="175.5" y="251.5"/><ellipse cx="190.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M193.4688,273.1406 Q192.8906,273.4375 192.25,273.5781 Q191.6094,273.7344 190.9063,273.7344 Q188.4063,273.7344 187.0781,272.0938 Q185.7656,270.4375 185.7656,267.3125 Q185.7656,264.1875 187.0781,262.5313 Q188.4063,260.875 190.9063,260.875 Q191.6094,260.875 192.25,261.0313 Q192.9063,261.1875 193.4688,261.4844 L193.4688,264.2031 Q192.8438,263.625 192.25,263.3594 Q191.6563,263.0781 191.0313,263.0781 Q189.6875,263.0781 189,264.1563 Q188.3125,265.2188 188.3125,267.3125 Q188.3125,269.4063 189,270.4844 Q189.6875,271.5469 191.0313,271.5469 Q191.6563,271.5469 192.25,271.2813 Q192.8438,271 193.4688,270.4219 L193.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="204.5" y="271.6543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="176.5" x2="214.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="176.5" x2="214.5" y1="291.5" y2="291.5"/><path d="M144,382 L144,407.1328 A0,0 0 0 0 144,407.1328 L247,407.1328 A0,0 0 0 0 247,407.1328 L247,392 L237,382 L199.5,382 L195.5,299.62 L191.5,382 L144,382 A0,0 0 0 0 144,382 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M237,382 L237,392 L247,392 L237,382 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="150" y="399.0669">C class note.</text><path d="M6,382 L6,407.1328 A0,0 0 0 0 6,407.1328 L109,407.1328 A0,0 0 0 0 109,407.1328 L109,392 L99,382 L75.31,382 L175.43,293.51 L67.31,382 L6,382 A0,0 0 0 0 6,382 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M99,382 L99,392 L109,392 L99,382 " 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="399.0669">C class note.</text><!--MD5=[413390f3d641c24380d3f98316fb29ac]
-class C_0000000461--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000461" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1006" y="251.5"/><ellipse cx="1021" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1023.9688,273.1406 Q1023.3906,273.4375 1022.75,273.5781 Q1022.1094,273.7344 1021.4063,273.7344 Q1018.9063,273.7344 1017.5781,272.0938 Q1016.2656,270.4375 1016.2656,267.3125 Q1016.2656,264.1875 1017.5781,262.5313 Q1018.9063,260.875 1021.4063,260.875 Q1022.1094,260.875 1022.75,261.0313 Q1023.4063,261.1875 1023.9688,261.4844 L1023.9688,264.2031 Q1023.3438,263.625 1022.75,263.3594 Q1022.1563,263.0781 1021.5313,263.0781 Q1020.1875,263.0781 1019.5,264.1563 Q1018.8125,265.2188 1018.8125,267.3125 Q1018.8125,269.4063 1019.5,270.4844 Q1020.1875,271.5469 1021.5313,271.5469 Q1022.1563,271.5469 1022.75,271.2813 Q1023.3438,271 1023.9688,270.4219 L1023.9688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1035" y="271.6543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1007" x2="1046" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="1007" x2="1046" y1="291.5" y2="291.5"/><path d="M916.5,248 L916.5,303.3984 A0,0 0 0 0 916.5,303.3984 L970.5,303.3984 A0,0 0 0 0 970.5,303.3984 L970.5,279.5 L1005.59,275.5 L970.5,271.5 L970.5,258 L960.5,248 L916.5,248 A0,0 0 0 0 916.5,248 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M960.5,248 L960.5,258 L970.5,258 L960.5,248 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="922.5" y="265.0669">D</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="922.5" y="280.1997">class</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="922.5" y="295.3325">note.</text><path d="M827.5,248 L827.5,303.3984 L881.5,303.3984 L881.5,258 L871.5,248 L827.5,248 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M871.5,248 L871.5,258 L881.5,258 L871.5,248 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="833.5" y="265.0669">D</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="833.5" y="280.1997">class</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="833.5" y="295.3325">note.</text><!--MD5=[9301ad3bb78055f54aa08c8900bf70de]
-class C_0000000463--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="60.8047" id="C_0000000463" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="481.5" y="364"/><ellipse cx="510.45" cy="380" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M513.4188,385.6406 Q512.8406,385.9375 512.2,386.0781 Q511.5594,386.2344 510.8563,386.2344 Q508.3563,386.2344 507.0281,384.5938 Q505.7156,382.9375 505.7156,379.8125 Q505.7156,376.6875 507.0281,375.0313 Q508.3563,373.375 510.8563,373.375 Q511.5594,373.375 512.2,373.5313 Q512.8563,373.6875 513.4188,373.9844 L513.4188,376.7031 Q512.7938,376.125 512.2,375.8594 Q511.6063,375.5781 510.9813,375.5781 Q509.6375,375.5781 508.95,376.6563 Q508.2625,377.7188 508.2625,379.8125 Q508.2625,381.9063 508.95,382.9844 Q509.6375,384.0469 510.9813,384.0469 Q511.6063,384.0469 512.2,383.7813 Q512.7938,383.5 513.4188,382.9219 L513.4188,385.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="527.55" y="384.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="557.5" y="361"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="558.5" y="373.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="562.5" y1="396" y2="396"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="489.5" y="404"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="501.5" y="410.2104">param : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="562.5" y1="416.8047" y2="416.8047"/><path d="M282.5,382 L282.5,407.1328 A0,0 0 0 0 282.5,407.1328 L446.5,407.1328 A0,0 0 0 0 446.5,407.1328 L446.5,400 L481.28,394.5 L446.5,392 L446.5,392 L436.5,382 L282.5,382 A0,0 0 0 0 282.5,382 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M436.5,382 L436.5,392 L446.5,392 L436.5,382 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="288.5" y="399.0669">E template class note.</text><!--MD5=[2dc88a9089ab0c0986d7ddc409e882b8]
-class C_0000000465--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000465" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="304" y="251.5"/><ellipse cx="319" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M321.9688,273.1406 Q321.3906,273.4375 320.75,273.5781 Q320.1094,273.7344 319.4063,273.7344 Q316.9063,273.7344 315.5781,272.0938 Q314.2656,270.4375 314.2656,267.3125 Q314.2656,264.1875 315.5781,262.5313 Q316.9063,260.875 319.4063,260.875 Q320.1094,260.875 320.75,261.0313 Q321.4063,261.1875 321.9688,261.4844 L321.9688,264.2031 Q321.3438,263.625 320.75,263.3594 Q320.1563,263.0781 319.5313,263.0781 Q318.1875,263.0781 317.5,264.1563 Q316.8125,265.2188 316.8125,267.3125 Q316.8125,269.4063 317.5,270.4844 Q318.1875,271.5469 319.5313,271.5469 Q320.1563,271.5469 320.75,271.2813 Q321.3438,271 321.9688,270.4219 L321.9688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="333" y="271.6543">G</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="305" x2="344" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="305" x2="344" y1="291.5" y2="291.5"/><!--MD5=[d7e5fa1f4b9e04d8bc1eb8f7ca9a681e]
-class C_0000000467--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="86.4141" id="C_0000000467" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="1276.5" y="59"/><ellipse cx="1292.85" cy="75" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1296.9594,81 L1289.2406,81 L1289.2406,68.6094 L1296.9594,68.6094 L1296.9594,70.7656 L1291.6938,70.7656 L1291.6938,73.4375 L1296.4594,73.4375 L1296.4594,75.5938 L1291.6938,75.5938 L1291.6938,78.8438 L1296.9594,78.8438 L1296.9594,81 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1307.15" y="79.1543">F</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1277.5" x2="1317.5" y1="91" y2="91"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="1282.5" y="105.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="1282.5" y="118.0151">two</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="1282.5" y="130.8198">three</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1277.5" x2="1317.5" y1="137.4141" y2="137.4141"/><path d="M1157.5,263 L1157.5,288.1328 A0,0 0 0 0 1157.5,288.1328 L1263.5,288.1328 A0,0 0 0 0 1263.5,288.1328 L1263.5,273 L1253.5,263 L1220.42,263 L1276.44,144.52 L1212.42,263 L1157.5,263 A0,0 0 0 0 1157.5,263 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1253.5,263 L1253.5,273 L1263.5,273 L1253.5,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1163.5" y="280.0669">F enum note.</text><path d="M1298.5,263 L1298.5,288.1328 A0,0 0 0 0 1298.5,288.1328 L1404.5,288.1328 A0,0 0 0 0 1404.5,288.1328 L1404.5,273 L1394.5,263 L1351.87,263 L1310.85,145.39 L1343.87,263 L1298.5,263 A0,0 0 0 0 1298.5,263 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1394.5,263 L1394.5,273 L1404.5,273 L1394.5,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1304.5" y="280.0669">F enum note.</text><!--MD5=[d0e15c5bd81027a0010670656bed7f1a]
-class C_0000000472--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="48" id="C_0000000472" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="380.5" y="251.5"/><ellipse cx="395.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M398.4688,273.1406 Q397.8906,273.4375 397.25,273.5781 Q396.6094,273.7344 395.9063,273.7344 Q393.4063,273.7344 392.0781,272.0938 Q390.7656,270.4375 390.7656,267.3125 Q390.7656,264.1875 392.0781,262.5313 Q393.4063,260.875 395.9063,260.875 Q396.6094,260.875 397.25,261.0313 Q397.9063,261.1875 398.4688,261.4844 L398.4688,264.2031 Q397.8438,263.625 397.25,263.3594 Q396.6563,263.0781 396.0313,263.0781 Q394.6875,263.0781 394,264.1563 Q393.3125,265.2188 393.3125,267.3125 Q393.3125,269.4063 394,270.4844 Q394.6875,271.5469 396.0313,271.5469 Q396.6563,271.5469 397.25,271.2813 Q397.8438,271 398.4688,270.4219 L398.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="409.5" y="271.6543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="425.5" y="248.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="426.5" y="260.6387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="439.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="439.5" y1="291.5" y2="291.5"/><!--MD5=[42e83dd12765435d8cd00a2f35878a16]
-class C_0000000469--><rect fill="#FEFECE" filter="url(#fqcawhn7d8z3n)" height="137.6328" id="C_0000000469" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="284.5" y="33"/><ellipse cx="402.25" cy="49" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M405.2188,54.6406 Q404.6406,54.9375 404,55.0781 Q403.3594,55.2344 402.6563,55.2344 Q400.1563,55.2344 398.8281,53.5938 Q397.5156,51.9375 397.5156,48.8125 Q397.5156,45.6875 398.8281,44.0313 Q400.1563,42.375 402.6563,42.375 Q403.3594,42.375 404,42.5313 Q404.6563,42.6875 405.2188,42.9844 L405.2188,45.7031 Q404.5938,45.125 404,44.8594 Q403.4063,44.5781 402.7813,44.5781 Q401.4375,44.5781 400.75,45.6563 Q400.0625,46.7188 400.0625,48.8125 Q400.0625,50.9063 400.75,51.9844 Q401.4375,53.0469 402.7813,53.0469 Q403.4063,53.0469 404,52.7813 Q404.5938,52.5 405.2188,51.9219 L405.2188,54.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="422.75" y="53.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="535.5" y1="65" y2="65"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="73"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="304.5" y="79.2104">aaa : A</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="85.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304.5" y="92.0151">bbb : B*</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="98.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="48" x="304.5" y="104.8198">ccc : C&amp;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="111.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="304.5" y="117.6245">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="124.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="304.5" y="130.4292">eee : E&lt;int&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="137.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="304.5" y="143.2339">ggg : G**</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="535.5" y1="149.8281" y2="149.8281"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="157.8281"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="78" x="304.5" y="164.0386">R(C&amp; c) : void</text><path d="M708.5,89.5 L708.5,114.6328 L810.5,114.6328 L810.5,99.5 L800.5,89.5 L708.5,89.5 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M800.5,89.5 L800.5,99.5 L810.5,99.5 L800.5,89.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="714.5" y="106.5669">R class note.</text><path d="M571.5,89.5 L571.5,98 L536.79,102 L571.5,106 L571.5,114.6328 A0,0 0 0 0 571.5,114.6328 L673.5,114.6328 A0,0 0 0 0 673.5,114.6328 L673.5,99.5 L663.5,89.5 L571.5,89.5 A0,0 0 0 0 571.5,89.5 " fill="#FBFB77" filter="url(#fqcawhn7d8z3n)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M663.5,89.5 L663.5,99.5 L673.5,99.5 L663.5,89.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="577.5" y="106.5669">R class note.</text><!--MD5=[01a0bacd441b7554a7f570ac27348fa1]
-link GMN381 to C_0000000457--><path d="M538.85,262.76 C554.09,246.73 582.86,220.02 614,209.5 C657.37,194.84 675.5,190.18 717,209.5 C735.46,218.1 749.97,236.18 759.52,251.26 " fill="none" id="GMN381-C_0000000457" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[c0325f438cf2557be50b687a44f7abd8]
-link GMN398 to C_0000000461--><path d="M871.97,247.82 C882.72,233.48 897.9,217.37 916,209.5 C938.01,199.93 948.2,199.46 970,209.5 C988.63,218.08 1003.42,236.17 1013.18,251.24 " fill="none" id="GMN398-C_0000000461" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[328c3ea87a6e6656a0e1bbda294add5f]
-link C_0000000469 to GMN415--><path d="M527.16,32.89 C541.54,26.81 556.34,21.6 571,18 C615.02,7.18 630.48,2.27 673,18 C709.32,31.44 738.32,69.32 751.61,89.3 " fill="none" id="C_0000000469-GMN415" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[783aca6baefb57b9717bd07851efd3c6]
-link C_0000000472 to C_0000000463--><path d="M432.63,299.62 C446.17,313.76 463.94,332.33 480.1,349.21 " fill="none" id="C_0000000472-&gt;C_0000000463" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="485.26,344.48,494.03,363.76,475.15,354.16,485.26,344.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[db0d1d37d02bff09ce11c9954ad1b4a2]
-link C_0000000469 to C_0000000459--><path d="M284.09,148.53 C259.29,162.23 235.45,179.51 217.5,201 C206.84,213.77 201.34,231.57 198.51,246.45 " fill="none" id="C_0000000469-&gt;C_0000000459" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="197.65,251.38,203.16,243.2167,198.523,246.4568,195.2829,241.8198,197.65,251.38" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[db0d1d37d02bff09ce11c9954ad1b4a2]
-link C_0000000469 to C_0000000459--><path d="M325.22,171.03 C287.16,201.39 245.21,234.85 219.61,255.27 " fill="none" id="C_0000000469-&gt;C_0000000459-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="215.64,258.43,225.1688,255.9397,219.5471,255.31,220.1769,249.6883,215.64,258.43" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="297.5" y="214.0669">ccc</text><!--MD5=[ab855787c9adde627ba1232e0e033f9b]
-reverse link C_0000000469 to C_0000000455--><path d="M549.32,169.81 C550.71,170.22 552.11,170.62 553.5,171 C687.76,208.14 728.06,178.27 865.5,201 C955.16,215.83 981.54,210.91 1064.5,248 C1070.67,250.76 1076.88,254.56 1082.44,258.42 " fill="none" id="C_0000000469&lt;-C_0000000455" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="536.71,165.81,541.2217,171.4353,548.1496,169.4343,543.6379,163.8089,536.71,165.81" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="977.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="987.5" y="214.0669">aaa</text><!--MD5=[f57dbc5d15783136771ad872d86a239a]
-link C_0000000469 to C_0000000457--><path d="M536.69,163.36 C542.36,165.96 547.99,168.52 553.5,171 C633.21,206.89 658.02,205.66 734.5,248 C739.04,250.51 743.7,253.44 748.14,256.42 " fill="none" id="C_0000000469-&gt;C_0000000457" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="752.49,259.39,747.3199,251.0073,748.3631,256.5671,742.8033,257.6103,752.49,259.39" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="673.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="683.5" y="214.0669">bbb</text><!--MD5=[8e36c7e6412d1169aca7e2e1342ccaa4]
-link C_0000000469 to C_0000000461--><path d="M536.87,165.25 C542.44,167.31 548,169.24 553.5,171 C565.16,174.73 976.16,243.39 987.5,248 C992.28,249.94 997.07,252.53 1001.57,255.34 " fill="none" id="C_0000000469-&gt;C_0000000461" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1005.97,258.19,1000.602,249.9326,1001.7771,255.4661,996.2437,256.6412,1005.97,258.19" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="824.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="834.5" y="214.0669">ddd</text><!--MD5=[29137e50f41b0ae72d085216f6a39786]
-reverse link C_0000000469 to C_0000000472--><path d="M410.5,184.39 C410.5,208.89 410.5,233.87 410.5,251.29 " fill="none" id="C_0000000469&lt;-C_0000000472" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="410.5,171.27,406.5,177.27,410.5,183.27,414.5,177.27,410.5,171.27" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="413.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="423.5" y="214.0669">eee</text><!--MD5=[3ea0f589b4fd6bdff1a2923a4f4465cf]
-link C_0000000469 to C_0000000465--><path d="M376.26,171.27 C363.02,197.67 348.63,226.38 338.39,246.81 " fill="none" id="C_0000000469-&gt;C_0000000465" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="336.14,251.29,343.7506,245.0387,338.3818,246.8207,336.5998,241.4519,336.14,251.29" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="363.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="373.5" y="214.0669">ggg</text><!--MD5=[723eb826ae940590bc9f1a5126ec76c6]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="435px" preserveAspectRatio="none" style="width:1416px;height:435px;" version="1.1" viewBox="0 0 1416 435" width="1416px" zoomAndPan="magnify"><defs><filter height="300%" id="fx0xvx3un9ze4" 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></defs><g><!--MD5=[c2e4c9b3710659d9e7af77a354f35997]
+class C_0000000522--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000522" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1082.5" y="251.5"/><ellipse cx="1097.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1100.4688,273.1406 Q1099.8906,273.4375 1099.25,273.5781 Q1098.6094,273.7344 1097.9063,273.7344 Q1095.4063,273.7344 1094.0781,272.0938 Q1092.7656,270.4375 1092.7656,267.3125 Q1092.7656,264.1875 1094.0781,262.5313 Q1095.4063,260.875 1097.9063,260.875 Q1098.6094,260.875 1099.25,261.0313 Q1099.9063,261.1875 1100.4688,261.4844 L1100.4688,264.2031 Q1099.8438,263.625 1099.25,263.3594 Q1098.6563,263.0781 1098.0313,263.0781 Q1096.6875,263.0781 1096,264.1563 Q1095.3125,265.2188 1095.3125,267.3125 Q1095.3125,269.4063 1096,270.4844 Q1096.6875,271.5469 1098.0313,271.5469 Q1098.6563,271.5469 1099.25,271.2813 Q1099.8438,271 1100.4688,270.4219 L1100.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1111.5" y="271.6543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1083.5" x2="1121.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="1083.5" x2="1121.5" y1="291.5" y2="291.5"/><path d="M946,89.5 L946,114.6328 A0,0 0 0 0 946,114.6328 L1000.55,114.6328 L1088.37,251.42 L1008.55,114.6328 L1049,114.6328 A0,0 0 0 0 1049,114.6328 L1049,99.5 L1039,89.5 L946,89.5 A0,0 0 0 0 946,89.5 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1039,89.5 L1039,99.5 L1049,99.5 L1039,89.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="952" y="106.5669">A class note.</text><path d="M1084,89.5 L1084,114.6328 A0,0 0 0 0 1084,114.6328 L1129.28,114.6328 L1106.94,251.42 L1137.28,114.6328 L1187,114.6328 A0,0 0 0 0 1187,114.6328 L1187,99.5 L1177,89.5 L1084,89.5 A0,0 0 0 0 1084,89.5 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1177,89.5 L1177,99.5 L1187,99.5 L1177,89.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="1090" y="106.5669">A class note.</text><!--MD5=[416df72163c563a89112241f2541dd3f]
+class C_0000000524--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000524" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="752.5" y="251.5"/><ellipse cx="767.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M770.4688,273.1406 Q769.8906,273.4375 769.25,273.5781 Q768.6094,273.7344 767.9063,273.7344 Q765.4063,273.7344 764.0781,272.0938 Q762.7656,270.4375 762.7656,267.3125 Q762.7656,264.1875 764.0781,262.5313 Q765.4063,260.875 767.9063,260.875 Q768.6094,260.875 769.25,261.0313 Q769.9063,261.1875 770.4688,261.4844 L770.4688,264.2031 Q769.8438,263.625 769.25,263.3594 Q768.6563,263.0781 768.0313,263.0781 Q766.6875,263.0781 766,264.1563 Q765.3125,265.2188 765.3125,267.3125 Q765.3125,269.4063 766,270.4844 Q766.6875,271.5469 768.0313,271.5469 Q768.6563,271.5469 769.25,271.2813 Q769.8438,271 770.4688,270.4219 L770.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="781.5" y="271.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="791.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="791.5" y1="291.5" y2="291.5"/><path d="M476,263 L476,288.1328 L579,288.1328 L579,273 L569,263 L476,263 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M569,263 L569,273 L579,273 L569,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="482" y="280.0669">B class note.</text><path d="M614,263 L614,288.1328 A0,0 0 0 0 614,288.1328 L717,288.1328 A0,0 0 0 0 717,288.1328 L717,281 L752.24,275.5 L717,273 L717,273 L707,263 L614,263 A0,0 0 0 0 614,263 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M707,263 L707,273 L717,273 L707,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="620" y="280.0669">B class note.</text><!--MD5=[557ea7e6a2f8849c7534d760d143ef48]
+class C_0000000526--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000526" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="175.5" y="251.5"/><ellipse cx="190.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M193.4688,273.1406 Q192.8906,273.4375 192.25,273.5781 Q191.6094,273.7344 190.9063,273.7344 Q188.4063,273.7344 187.0781,272.0938 Q185.7656,270.4375 185.7656,267.3125 Q185.7656,264.1875 187.0781,262.5313 Q188.4063,260.875 190.9063,260.875 Q191.6094,260.875 192.25,261.0313 Q192.9063,261.1875 193.4688,261.4844 L193.4688,264.2031 Q192.8438,263.625 192.25,263.3594 Q191.6563,263.0781 191.0313,263.0781 Q189.6875,263.0781 189,264.1563 Q188.3125,265.2188 188.3125,267.3125 Q188.3125,269.4063 189,270.4844 Q189.6875,271.5469 191.0313,271.5469 Q191.6563,271.5469 192.25,271.2813 Q192.8438,271 193.4688,270.4219 L193.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="204.5" y="271.6543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="176.5" x2="214.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="176.5" x2="214.5" y1="291.5" y2="291.5"/><path d="M144,382 L144,407.1328 A0,0 0 0 0 144,407.1328 L247,407.1328 A0,0 0 0 0 247,407.1328 L247,392 L237,382 L199.5,382 L195.5,299.62 L191.5,382 L144,382 A0,0 0 0 0 144,382 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M237,382 L237,392 L247,392 L237,382 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="150" y="399.0669">C class note.</text><path d="M6,382 L6,407.1328 A0,0 0 0 0 6,407.1328 L109,407.1328 A0,0 0 0 0 109,407.1328 L109,392 L99,382 L75.31,382 L175.43,293.51 L67.31,382 L6,382 A0,0 0 0 0 6,382 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M99,382 L99,392 L109,392 L99,382 " 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="399.0669">C class note.</text><!--MD5=[517d5b5adb1d1aa2b93c5b15c8dedaef]
+class C_0000000528--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000528" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1006" y="251.5"/><ellipse cx="1021" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1023.9688,273.1406 Q1023.3906,273.4375 1022.75,273.5781 Q1022.1094,273.7344 1021.4063,273.7344 Q1018.9063,273.7344 1017.5781,272.0938 Q1016.2656,270.4375 1016.2656,267.3125 Q1016.2656,264.1875 1017.5781,262.5313 Q1018.9063,260.875 1021.4063,260.875 Q1022.1094,260.875 1022.75,261.0313 Q1023.4063,261.1875 1023.9688,261.4844 L1023.9688,264.2031 Q1023.3438,263.625 1022.75,263.3594 Q1022.1563,263.0781 1021.5313,263.0781 Q1020.1875,263.0781 1019.5,264.1563 Q1018.8125,265.2188 1018.8125,267.3125 Q1018.8125,269.4063 1019.5,270.4844 Q1020.1875,271.5469 1021.5313,271.5469 Q1022.1563,271.5469 1022.75,271.2813 Q1023.3438,271 1023.9688,270.4219 L1023.9688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1035" y="271.6543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1007" x2="1046" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="1007" x2="1046" y1="291.5" y2="291.5"/><path d="M916.5,248 L916.5,303.3984 A0,0 0 0 0 916.5,303.3984 L970.5,303.3984 A0,0 0 0 0 970.5,303.3984 L970.5,279.5 L1005.59,275.5 L970.5,271.5 L970.5,258 L960.5,248 L916.5,248 A0,0 0 0 0 916.5,248 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M960.5,248 L960.5,258 L970.5,258 L960.5,248 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="922.5" y="265.0669">D</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="922.5" y="280.1997">class</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="922.5" y="295.3325">note.</text><path d="M827.5,248 L827.5,303.3984 L881.5,303.3984 L881.5,258 L871.5,248 L827.5,248 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M871.5,248 L871.5,258 L881.5,258 L871.5,248 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="833.5" y="265.0669">D</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="833.5" y="280.1997">class</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="833.5" y="295.3325">note.</text><!--MD5=[1c91453612644206b7a862cf2d984e06]
+class C_0000000530--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="60.8047" id="C_0000000530" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="481.5" y="364"/><ellipse cx="510.45" cy="380" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M513.4188,385.6406 Q512.8406,385.9375 512.2,386.0781 Q511.5594,386.2344 510.8563,386.2344 Q508.3563,386.2344 507.0281,384.5938 Q505.7156,382.9375 505.7156,379.8125 Q505.7156,376.6875 507.0281,375.0313 Q508.3563,373.375 510.8563,373.375 Q511.5594,373.375 512.2,373.5313 Q512.8563,373.6875 513.4188,373.9844 L513.4188,376.7031 Q512.7938,376.125 512.2,375.8594 Q511.6063,375.5781 510.9813,375.5781 Q509.6375,375.5781 508.95,376.6563 Q508.2625,377.7188 508.2625,379.8125 Q508.2625,381.9063 508.95,382.9844 Q509.6375,384.0469 510.9813,384.0469 Q511.6063,384.0469 512.2,383.7813 Q512.7938,383.5 513.4188,382.9219 L513.4188,385.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="527.55" y="384.1543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="557.5" y="361"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="558.5" y="373.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="562.5" y1="396" y2="396"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="489.5" y="404"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="501.5" y="410.2104">param : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="562.5" y1="416.8047" y2="416.8047"/><path d="M282.5,382 L282.5,407.1328 A0,0 0 0 0 282.5,407.1328 L446.5,407.1328 A0,0 0 0 0 446.5,407.1328 L446.5,400 L481.28,394.5 L446.5,392 L446.5,392 L436.5,382 L282.5,382 A0,0 0 0 0 282.5,382 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M436.5,382 L436.5,392 L446.5,392 L436.5,382 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="288.5" y="399.0669">E template class note.</text><!--MD5=[9c86714ef1b7ddf9364eb555623ea5ea]
+class C_0000000532--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000532" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="304" y="251.5"/><ellipse cx="319" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M321.9688,273.1406 Q321.3906,273.4375 320.75,273.5781 Q320.1094,273.7344 319.4063,273.7344 Q316.9063,273.7344 315.5781,272.0938 Q314.2656,270.4375 314.2656,267.3125 Q314.2656,264.1875 315.5781,262.5313 Q316.9063,260.875 319.4063,260.875 Q320.1094,260.875 320.75,261.0313 Q321.4063,261.1875 321.9688,261.4844 L321.9688,264.2031 Q321.3438,263.625 320.75,263.3594 Q320.1563,263.0781 319.5313,263.0781 Q318.1875,263.0781 317.5,264.1563 Q316.8125,265.2188 316.8125,267.3125 Q316.8125,269.4063 317.5,270.4844 Q318.1875,271.5469 319.5313,271.5469 Q320.1563,271.5469 320.75,271.2813 Q321.3438,271 321.9688,270.4219 L321.9688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="333" y="271.6543">G</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="305" x2="344" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="305" x2="344" y1="291.5" y2="291.5"/><!--MD5=[0699cc0f23bf0d85cdb3e0a0f829324e]
+class C_0000000534--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="86.4141" id="C_0000000534" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="1276.5" y="59"/><ellipse cx="1292.85" cy="75" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1296.9594,81 L1289.2406,81 L1289.2406,68.6094 L1296.9594,68.6094 L1296.9594,70.7656 L1291.6938,70.7656 L1291.6938,73.4375 L1296.4594,73.4375 L1296.4594,75.5938 L1291.6938,75.5938 L1291.6938,78.8438 L1296.9594,78.8438 L1296.9594,81 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1307.15" y="79.1543">F</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1277.5" x2="1317.5" y1="91" y2="91"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="1282.5" y="105.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="1282.5" y="118.0151">two</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="1282.5" y="130.8198">three</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="1277.5" x2="1317.5" y1="137.4141" y2="137.4141"/><path d="M1157.5,263 L1157.5,288.1328 A0,0 0 0 0 1157.5,288.1328 L1263.5,288.1328 A0,0 0 0 0 1263.5,288.1328 L1263.5,273 L1253.5,263 L1220.42,263 L1276.44,144.52 L1212.42,263 L1157.5,263 A0,0 0 0 0 1157.5,263 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1253.5,263 L1253.5,273 L1263.5,273 L1253.5,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1163.5" y="280.0669">F enum note.</text><path d="M1298.5,263 L1298.5,288.1328 A0,0 0 0 0 1298.5,288.1328 L1404.5,288.1328 A0,0 0 0 0 1404.5,288.1328 L1404.5,273 L1394.5,263 L1351.87,263 L1310.85,145.39 L1343.87,263 L1298.5,263 A0,0 0 0 0 1298.5,263 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M1394.5,263 L1394.5,273 L1404.5,273 L1394.5,263 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1304.5" y="280.0669">F enum note.</text><!--MD5=[bab358c5639da8d9bc74ed0700a8ba04]
+class C_0000000539--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="48" id="C_0000000539" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="380.5" y="251.5"/><ellipse cx="395.5" cy="267.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M398.4688,273.1406 Q397.8906,273.4375 397.25,273.5781 Q396.6094,273.7344 395.9063,273.7344 Q393.4063,273.7344 392.0781,272.0938 Q390.7656,270.4375 390.7656,267.3125 Q390.7656,264.1875 392.0781,262.5313 Q393.4063,260.875 395.9063,260.875 Q396.6094,260.875 397.25,261.0313 Q397.9063,261.1875 398.4688,261.4844 L398.4688,264.2031 Q397.8438,263.625 397.25,263.3594 Q396.6563,263.0781 396.0313,263.0781 Q394.6875,263.0781 394,264.1563 Q393.3125,265.2188 393.3125,267.3125 Q393.3125,269.4063 394,270.4844 Q394.6875,271.5469 396.0313,271.5469 Q396.6563,271.5469 397.25,271.2813 Q397.8438,271 398.4688,270.4219 L398.4688,273.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="409.5" y="271.6543">E</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="425.5" y="248.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="426.5" y="260.6387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="439.5" y1="283.5" y2="283.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="439.5" y1="291.5" y2="291.5"/><!--MD5=[9cd97f56fb722b2ceff3a1fb6049b6b2]
+class C_0000000536--><rect fill="#FEFECE" filter="url(#fx0xvx3un9ze4)" height="137.6328" id="C_0000000536" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="284.5" y="33"/><ellipse cx="402.25" cy="49" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M405.2188,54.6406 Q404.6406,54.9375 404,55.0781 Q403.3594,55.2344 402.6563,55.2344 Q400.1563,55.2344 398.8281,53.5938 Q397.5156,51.9375 397.5156,48.8125 Q397.5156,45.6875 398.8281,44.0313 Q400.1563,42.375 402.6563,42.375 Q403.3594,42.375 404,42.5313 Q404.6563,42.6875 405.2188,42.9844 L405.2188,45.7031 Q404.5938,45.125 404,44.8594 Q403.4063,44.5781 402.7813,44.5781 Q401.4375,44.5781 400.75,45.6563 Q400.0625,46.7188 400.0625,48.8125 Q400.0625,50.9063 400.75,51.9844 Q401.4375,53.0469 402.7813,53.0469 Q403.4063,53.0469 404,52.7813 Q404.5938,52.5 405.2188,51.9219 L405.2188,54.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="422.75" y="53.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="535.5" y1="65" y2="65"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="73"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="304.5" y="79.2104">aaa : A</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="85.8047"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304.5" y="92.0151">bbb : B*</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="98.6094"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="48" x="304.5" y="104.8198">ccc : C&amp;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="111.4141"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="304.5" y="117.6245">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="124.2188"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="304.5" y="130.4292">eee : E&lt;int&gt;</text><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="137.0234"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="304.5" y="143.2339">ggg : G**</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="535.5" y1="149.8281" y2="149.8281"/><rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="292.5" y="157.8281"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="78" x="304.5" y="164.0386">R(C&amp; c) : void</text><path d="M708.5,89.5 L708.5,114.6328 L810.5,114.6328 L810.5,99.5 L800.5,89.5 L708.5,89.5 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M800.5,89.5 L800.5,99.5 L810.5,99.5 L800.5,89.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="714.5" y="106.5669">R class note.</text><path d="M571.5,89.5 L571.5,98 L536.79,102 L571.5,106 L571.5,114.6328 A0,0 0 0 0 571.5,114.6328 L673.5,114.6328 A0,0 0 0 0 673.5,114.6328 L673.5,99.5 L663.5,89.5 L571.5,89.5 A0,0 0 0 0 571.5,89.5 " fill="#FBFB77" filter="url(#fx0xvx3un9ze4)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M663.5,89.5 L663.5,99.5 L673.5,99.5 L663.5,89.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="577.5" y="106.5669">R class note.</text><!--MD5=[3286ac67c013279c999cc1c1c52ddbe5]
+link GMN381 to C_0000000524--><path d="M538.85,262.76 C554.09,246.73 582.86,220.02 614,209.5 C657.37,194.84 675.5,190.18 717,209.5 C735.46,218.1 749.97,236.18 759.52,251.26 " fill="none" id="GMN381-C_0000000524" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[bf37b26ad5a6960174a74fa7a04f736f]
+link GMN398 to C_0000000528--><path d="M871.97,247.82 C882.72,233.48 897.9,217.37 916,209.5 C938.01,199.93 948.2,199.46 970,209.5 C988.63,218.08 1003.42,236.17 1013.18,251.24 " fill="none" id="GMN398-C_0000000528" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[574bde7f8ea3191a6b1b4916e8dd0b55]
+link C_0000000536 to GMN415--><path d="M527.16,32.89 C541.54,26.81 556.34,21.6 571,18 C615.02,7.18 630.48,2.27 673,18 C709.32,31.44 738.32,69.32 751.61,89.3 " fill="none" id="C_0000000536-GMN415" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[910f6f5e9295676e04d663aaaddbb565]
+link C_0000000539 to C_0000000530--><path d="M432.63,299.62 C446.17,313.76 463.94,332.33 480.1,349.21 " fill="none" id="C_0000000539-&gt;C_0000000530" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="485.26,344.48,494.03,363.76,475.15,354.16,485.26,344.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0c4db5f31d0a4b81f527e208557769f8]
+link C_0000000536 to C_0000000526--><path d="M284.09,148.53 C259.29,162.23 235.45,179.51 217.5,201 C206.84,213.77 201.34,231.57 198.51,246.45 " fill="none" id="C_0000000536-&gt;C_0000000526" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="197.65,251.38,203.16,243.2167,198.523,246.4568,195.2829,241.8198,197.65,251.38" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0c4db5f31d0a4b81f527e208557769f8]
+link C_0000000536 to C_0000000526--><path d="M325.22,171.03 C287.16,201.39 245.21,234.85 219.61,255.27 " fill="none" id="C_0000000536-&gt;C_0000000526-1" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="215.64,258.43,225.1688,255.9397,219.5471,255.31,220.1769,249.6883,215.64,258.43" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="297.5" y="214.0669">ccc</text><!--MD5=[24f1fef4d4a20c88e43ed8e742a28507]
+reverse link C_0000000536 to C_0000000522--><path d="M549.32,169.81 C550.71,170.22 552.11,170.62 553.5,171 C687.76,208.14 728.06,178.27 865.5,201 C955.16,215.83 981.54,210.91 1064.5,248 C1070.67,250.76 1076.88,254.56 1082.44,258.42 " fill="none" id="C_0000000536&lt;-C_0000000522" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="536.71,165.81,541.2217,171.4353,548.1496,169.4343,543.6379,163.8089,536.71,165.81" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="977.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="987.5" y="214.0669">aaa</text><!--MD5=[e529199803cd89ff32328c84ad623d04]
+link C_0000000536 to C_0000000524--><path d="M536.69,163.36 C542.36,165.96 547.99,168.52 553.5,171 C633.21,206.89 658.02,205.66 734.5,248 C739.04,250.51 743.7,253.44 748.14,256.42 " fill="none" id="C_0000000536-&gt;C_0000000524" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="752.49,259.39,747.3199,251.0073,748.3631,256.5671,742.8033,257.6103,752.49,259.39" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="673.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="683.5" y="214.0669">bbb</text><!--MD5=[3a17a58add36087ba5c6f47d9a4f6ed3]
+link C_0000000536 to C_0000000528--><path d="M536.87,165.25 C542.44,167.31 548,169.24 553.5,171 C565.16,174.73 976.16,243.39 987.5,248 C992.28,249.94 997.07,252.53 1001.57,255.34 " fill="none" id="C_0000000536-&gt;C_0000000528" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="1005.97,258.19,1000.602,249.9326,1001.7771,255.4661,996.2437,256.6412,1005.97,258.19" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="824.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="834.5" y="214.0669">ddd</text><!--MD5=[854dbe863a74121061be8aff9b9df79c]
+reverse link C_0000000536 to C_0000000539--><path d="M410.5,184.39 C410.5,208.89 410.5,233.87 410.5,251.29 " fill="none" id="C_0000000536&lt;-C_0000000539" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="410.5,171.27,406.5,177.27,410.5,183.27,414.5,177.27,410.5,171.27" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="413.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="423.5" y="214.0669">eee</text><!--MD5=[bc2088341e709063a7ffa12ff1751931]
+link C_0000000536 to C_0000000532--><path d="M376.26,171.27 C363.02,197.67 348.63,226.38 338.39,246.81 " fill="none" id="C_0000000536-&gt;C_0000000532" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="336.14,251.29,343.7506,245.0387,338.3818,246.8207,336.5998,241.4519,336.14,251.29" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="363.5" y="207.0664"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="373.5" y="214.0669">ggg</text><!--MD5=[807861781fc3af3256ad3544b5583536]
 @startuml
-class "A" as C_0000000455
-class C_0000000455 {
+
+class "A" as C_0000000522
+class C_0000000522 {
 }
-note top of C_0000000455
+note top of C_0000000522
 A class note.
 end note
-note top of C_0000000455
+note top of C_0000000522
 A class note.
 end note
 
-class "B" as C_0000000457
-class C_0000000457 {
+class "B" as C_0000000524
+class C_0000000524 {
 }
-note left of C_0000000457
+note left of C_0000000524
 B class note.
 end note
-note left of C_0000000457
+note left of C_0000000524
 B class note.
 end note
 
-class "C" as C_0000000459
-class C_0000000459 {
+class "C" as C_0000000526
+class C_0000000526 {
 }
-note bottom of C_0000000459
+note bottom of C_0000000526
 C class note.
 end note
-note bottom of C_0000000459
+note bottom of C_0000000526
 C class note.
 end note
 
-class "D" as C_0000000461
-class C_0000000461 {
+class "D" as C_0000000528
+class C_0000000528 {
 }
-note left of C_0000000461
+note left of C_0000000528
 D
 class
 note.
 end note
-note left of C_0000000461
+note left of C_0000000528
 D
 class
 note.
 end note
 
-class "E<T>" as C_0000000463
-class C_0000000463 {
+class "E<T>" as C_0000000530
+class C_0000000530 {
 -param : T
 }
-note left of C_0000000463
+note left of C_0000000530
 E template class note.
 end note
 
-class "G" as C_0000000465
-class C_0000000465 {
+class "G" as C_0000000532
+class C_0000000532 {
 }
 
-enum "F" as C_0000000467
-enum C_0000000467 {
+enum "F" as C_0000000534
+enum C_0000000534 {
 one
 two
 three
 }
-note bottom of C_0000000467
+note bottom of C_0000000534
 F enum note.
 end note
-note bottom of C_0000000467
+note bottom of C_0000000534
 F enum note.
 end note
 
-class "E<int>" as C_0000000472
-class C_0000000472 {
+class "E<int>" as C_0000000539
+class C_0000000539 {
 }
 
-class "R" as C_0000000469
-class C_0000000469 {
+class "R" as C_0000000536
+class C_0000000536 {
 {static} -R(C& c) : void
 -aaa : A
 -bbb : B*
@@ -103,21 +104,21 @@ class C_0000000469 {
 -eee : E<int>
 -ggg : G**
 }
-note right of C_0000000469
+note right of C_0000000536
 R class note.
 end note
-note right of C_0000000469
+note right of C_0000000536
 R class note.
 end note
 
-C_0000000472 ..|> C_0000000463
-C_0000000469 ..> C_0000000459
-C_0000000469 o- - C_0000000455 : -aaa
-C_0000000469 - -> C_0000000457 : -bbb
-C_0000000469 - -> C_0000000459 : -ccc
-C_0000000469 - -> C_0000000461 : -ddd
-C_0000000469 o- - C_0000000472 : -eee
-C_0000000469 - -> C_0000000465 : -ggg
+C_0000000539 ..|> C_0000000530
+C_0000000536 ..> C_0000000526
+C_0000000536 o- - C_0000000522 : -aaa
+C_0000000536 - -> C_0000000524 : -bbb
+C_0000000536 - -> C_0000000526 : -ccc
+C_0000000536 - -> C_0000000528 : -ddd
+C_0000000536 o- - C_0000000539 : -eee
+C_0000000536 - -> C_0000000532 : -ggg
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 25d2a42d..f5a44483 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,60 +1,61 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1vsp1ll0skof7" 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></defs><g><!--MD5=[529238b71f520b20a157452748698b18]
-class C_0000000477--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="48" id="C_0000000477" 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"/><!--MD5=[05d23eab23381bdd959bb99020437687]
-class C_0000000481--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="60.8047" id="C_0000000481" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="161.5" y="17.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="162.5" y="29.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="60.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="66.7104">param : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="73.3047" y2="73.3047"/><!--MD5=[18b2747e012c1e694146a62388e3202b]
-class C_0000000485--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="86.4141" id="C_0000000485" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="40" y2="40"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="208.5" y="54.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="208.5" y="67.0151">two</text><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"/><!--MD5=[b9869e71b0d15c380b49ad771e826bb3]
-class C_0000000489--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="48" id="C_0000000489" 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"/><!--MD5=[31f5a50c0c9112a90197b098e60f5a03]
-class C_0000000491--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="48" id="C_0000000491" 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"/><!--MD5=[c9e523185550829d33720d7744e2d866]
-class C_0000000493--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="48" id="C_0000000493" 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"/><!--MD5=[7ea131a00181f94166de26730e9a00ef]
-class C_0000000495--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="48" id="C_0000000495" 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"/><!--MD5=[f0fe7d47155bef70354fa8b0726b70e1]
-class C_0000000497--><rect fill="#FEFECE" filter="url(#f1vsp1ll0skof7)" height="86.4141" id="C_0000000497" 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"/><ellipse cx="290.5" cy="51" 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="42" x="299.5" y="54.2104">g1 : G1</text><ellipse cx="290.5" cy="63.8047" 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="52" x="299.5" y="67.0151">g3 : G3&amp;</text><ellipse cx="290.5" cy="76.6094" 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="148" x="299.5" y="79.8198">g4 : std::shared_ptr&lt;G4&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="86.4141" y2="86.4141"/><!--MD5=[c19ba40d77986cad26010353b345c1d1]
-reverse link C_0000000497 to C_0000000489--><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_0000000497&lt;-C_0000000489" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="346.17,94.38,340.2378,98.4798,341.7406,105.5326,347.6728,101.4328,346.17,94.38" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="341.5" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="348.5" y="137.0669">g1</text><!--MD5=[c57cf32e28fdd10b7df20aef2fb0460f]
-link C_0000000497 to C_0000000495--><path d="M378.99,94.22 C385.81,117.28 394.07,145.22 400.12,165.66 " fill="none" id="C_0000000497-&gt;C_0000000495" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="401.61,170.69,402.9032,160.9264,400.1969,165.8939,395.2294,163.1875,401.61,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="397.5" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="404.5" y="137.0669">g4</text><!--MD5=[4039c0cb087ddd4706b9a0351e438241]
-link C_0000000477 to C_0000000481--><!--MD5=[2d76dab5a8dbaf71bfbf2e24ee8df326]
-link C_0000000481 to C_0000000485--><!--MD5=[14761f4a72eb0e8afa1d1f0094c5e4cb]
-link C_0000000477 to C_0000000491--><!--MD5=[d08a25e6a3cfbac6379de24f4da590c8]
-link C_0000000491 to C_0000000493--><!--MD5=[62f80a8b654ceaebb0a5cc9e5ecdc794]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1anfdij6s3806" 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></defs><g><!--MD5=[dd67575633884db750b201df22913fe3]
+class C_0000000546--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="48" id="C_0000000546" 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"/><!--MD5=[1b7934c02c724370f0d9ae56488a7112]
+class C_0000000550--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="60.8047" id="C_0000000550" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="161.5" y="17.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="162.5" y="29.6387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="60.5"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="66.7104">param : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="73.3047" y2="73.3047"/><!--MD5=[8b1219752732ae8ea5b44447b7a5f76a]
+class C_0000000554--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="86.4141" id="C_0000000554" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="40" y2="40"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="208.5" y="54.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="208.5" y="67.0151">two</text><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"/><!--MD5=[b84d75b83751ba1d0fc6e0a92f97e9f9]
+class C_0000000558--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="48" id="C_0000000558" 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"/><!--MD5=[59368f02f387434c4799df2dd110baa5]
+class C_0000000560--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="48" id="C_0000000560" 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"/><!--MD5=[3d7985a829008b02dd9dc695ba6d6b28]
+class C_0000000562--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="48" id="C_0000000562" 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"/><!--MD5=[7a1f976341c871d74211064daf71883b]
+class C_0000000564--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="48" id="C_0000000564" 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"/><!--MD5=[e923d4c5495bea29ad387586d64643ef]
+class C_0000000566--><rect fill="#FEFECE" filter="url(#f1anfdij6s3806)" height="86.4141" id="C_0000000566" 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"/><ellipse cx="290.5" cy="51" 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="42" x="299.5" y="54.2104">g1 : G1</text><ellipse cx="290.5" cy="63.8047" 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="52" x="299.5" y="67.0151">g3 : G3&amp;</text><ellipse cx="290.5" cy="76.6094" 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="148" x="299.5" y="79.8198">g4 : std::shared_ptr&lt;G4&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="86.4141" y2="86.4141"/><!--MD5=[d3f0e5ca42e031e71c47ed1f676e21c0]
+reverse link C_0000000566 to C_0000000558--><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_0000000566&lt;-C_0000000558" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="346.17,94.38,340.2378,98.4798,341.7406,105.5326,347.6728,101.4328,346.17,94.38" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="341.5" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="348.5" y="137.0669">g1</text><!--MD5=[214033268b79074a12a1a50d2afa7807]
+link C_0000000566 to C_0000000564--><path d="M378.99,94.22 C385.81,117.28 394.07,145.22 400.12,165.66 " fill="none" id="C_0000000566-&gt;C_0000000564" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="401.61,170.69,402.9032,160.9264,400.1969,165.8939,395.2294,163.1875,401.61,170.69" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="397.5" cy="133.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="404.5" y="137.0669">g4</text><!--MD5=[633c9b615da6988214824ecbd0756121]
+link C_0000000546 to C_0000000550--><!--MD5=[295075645bde1ef473786e1710fa5173]
+link C_0000000550 to C_0000000554--><!--MD5=[584069bea073d1325e8dd889a2391ab1]
+link C_0000000546 to C_0000000560--><!--MD5=[db09e20c8fa089acbf0c2e2c94f737d5]
+link C_0000000560 to C_0000000562--><!--MD5=[a1a41ab90609e8d6ea3a0a71673c8b67]
 @startuml
-class "A" as C_0000000477
-class C_0000000477 {
+
+class "A" as C_0000000546
+class C_0000000546 {
 }
 
-class "C<T>" as C_0000000481
-class C_0000000481 {
+class "C<T>" as C_0000000550
+class C_0000000550 {
 -param : T
 }
 
-enum "E" as C_0000000485
-enum C_0000000485 {
+enum "E" as C_0000000554
+enum C_0000000554 {
 one
 two
 three
 }
 
-class "G1" as C_0000000489
-class C_0000000489 {
+class "G1" as C_0000000558
+class C_0000000558 {
 }
 
-class "G2" as C_0000000491
-class C_0000000491 {
+class "G2" as C_0000000560
+class C_0000000560 {
 }
 
-class "G3" as C_0000000493
-class C_0000000493 {
+class "G3" as C_0000000562
+class C_0000000562 {
 }
 
-class "G4" as C_0000000495
-class C_0000000495 {
+class "G4" as C_0000000564
+class C_0000000564 {
 }
 
-class "R" as C_0000000497
-class C_0000000497 {
+class "R" as C_0000000566
+class C_0000000566 {
 +g1 : G1
 +g3 : G3&
 +g4 : std::shared_ptr<G4>
 }
 
-C_0000000497 o- - C_0000000489 : +g1
-C_0000000497 - -> C_0000000495 : +g4
+C_0000000566 o- - C_0000000558 : +g1
+C_0000000566 - -> C_0000000564 : +g4
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 976a41e6..735fb9f2 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,42 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:289px;height:243px;" version="1.1" viewBox="0 0 289 243" width="289px" zoomAndPan="magnify"><defs><filter height="300%" id="fl2d4zkzo04kd" 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></defs><g><!--MD5=[9d97640f061d6e9ec2c655f970db6173]
-class C_0000000501--><rect fill="#FEFECE" filter="url(#fl2d4zkzo04kd)" height="48" id="C_0000000501" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="184"/><ellipse cx="21" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M23.9688,205.6406 Q23.3906,205.9375 22.75,206.0781 Q22.1094,206.2344 21.4063,206.2344 Q18.9063,206.2344 17.5781,204.5938 Q16.2656,202.9375 16.2656,199.8125 Q16.2656,196.6875 17.5781,195.0313 Q18.9063,193.375 21.4063,193.375 Q22.1094,193.375 22.75,193.5313 Q23.4063,193.6875 23.9688,193.9844 L23.9688,196.7031 Q23.3438,196.125 22.75,195.8594 Q22.1563,195.5781 21.5313,195.5781 Q20.1875,195.5781 19.5,196.6563 Q18.8125,197.7188 18.8125,199.8125 Q18.8125,201.9063 19.5,202.9844 Q20.1875,204.0469 21.5313,204.0469 Q22.1563,204.0469 22.75,203.7813 Q23.3438,203.5 23.9688,202.9219 L23.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="204.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="224" y2="224"/><!--MD5=[496a6da11cbb64b613d514b62081ef0e]
-class C_0000000503--><rect fill="#FEFECE" filter="url(#fl2d4zkzo04kd)" height="48" id="C_0000000503" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="184"/><ellipse cx="99" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M101.9688,205.6406 Q101.3906,205.9375 100.75,206.0781 Q100.1094,206.2344 99.4063,206.2344 Q96.9063,206.2344 95.5781,204.5938 Q94.2656,202.9375 94.2656,199.8125 Q94.2656,196.6875 95.5781,195.0313 Q96.9063,193.375 99.4063,193.375 Q100.1094,193.375 100.75,193.5313 Q101.4063,193.6875 101.9688,193.9844 L101.9688,196.7031 Q101.3438,196.125 100.75,195.8594 Q100.1563,195.5781 99.5313,195.5781 Q98.1875,195.5781 97.5,196.6563 Q96.8125,197.7188 96.8125,199.8125 Q96.8125,201.9063 97.5,202.9844 Q98.1875,204.0469 99.5313,204.0469 Q100.1563,204.0469 100.75,203.7813 Q101.3438,203.5 101.9688,202.9219 L101.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="204.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="224" y2="224"/><!--MD5=[4c8b0e4d36d245def6ae21d36f8e14a6]
-class C_0000000505--><rect fill="#FEFECE" filter="url(#fl2d4zkzo04kd)" height="48" id="C_0000000505" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="162" y="184"/><ellipse cx="177" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M179.9688,205.6406 Q179.3906,205.9375 178.75,206.0781 Q178.1094,206.2344 177.4063,206.2344 Q174.9063,206.2344 173.5781,204.5938 Q172.2656,202.9375 172.2656,199.8125 Q172.2656,196.6875 173.5781,195.0313 Q174.9063,193.375 177.4063,193.375 Q178.1094,193.375 178.75,193.5313 Q179.4063,193.6875 179.9688,193.9844 L179.9688,196.7031 Q179.3438,196.125 178.75,195.8594 Q178.1563,195.5781 177.5313,195.5781 Q176.1875,195.5781 175.5,196.6563 Q174.8125,197.7188 174.8125,199.8125 Q174.8125,201.9063 175.5,202.9844 Q176.1875,204.0469 177.5313,204.0469 Q178.1563,204.0469 178.75,203.7813 Q179.3438,203.5 179.9688,202.9219 L179.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="204.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="201" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="201" y1="224" y2="224"/><!--MD5=[73e86389a0768bcce2842ffe44598aad]
-class C_0000000507--><rect fill="#FEFECE" filter="url(#fl2d4zkzo04kd)" height="48" id="C_0000000507" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="237.5" y="184"/><ellipse cx="252.5" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.4688,205.6406 Q254.8906,205.9375 254.25,206.0781 Q253.6094,206.2344 252.9063,206.2344 Q250.4063,206.2344 249.0781,204.5938 Q247.7656,202.9375 247.7656,199.8125 Q247.7656,196.6875 249.0781,195.0313 Q250.4063,193.375 252.9063,193.375 Q253.6094,193.375 254.25,193.5313 Q254.9063,193.6875 255.4688,193.9844 L255.4688,196.7031 Q254.8438,196.125 254.25,195.8594 Q253.6563,195.5781 253.0313,195.5781 Q251.6875,195.5781 251,196.6563 Q250.3125,197.7188 250.3125,199.8125 Q250.3125,201.9063 251,202.9844 Q251.6875,204.0469 253.0313,204.0469 Q253.6563,204.0469 254.25,203.7813 Q254.8438,203.5 255.4688,202.9219 L255.4688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="266.5" y="204.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="238.5" x2="277.5" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="238.5" x2="277.5" y1="224" y2="224"/><!--MD5=[5ca8fb9496321c4c65b2fd32c63866bc]
-class C_0000000509--><rect fill="#FEFECE" filter="url(#fl2d4zkzo04kd)" height="99.2188" id="C_0000000509" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/><ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/><ellipse cx="81" cy="51" 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="40" x="90" y="54.2104">aaa : A</text><ellipse cx="81" cy="63.8047" 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="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text><ellipse cx="81" cy="76.6094" 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="117" x="90" y="79.8198">ccc : std::vector&lt;C&gt;</text><ellipse cx="81" cy="89.4141" 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="41" x="90" y="92.6245">ddd : D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/><!--MD5=[dd11ad2b8efa72a0b7f069227a2d3799]
-link C_0000000509 to C_0000000501--><path d="M78.98,107.28 C69.45,116.44 60.37,126.47 53,137 C44.15,149.64 37.71,165.57 33.34,179.04 " fill="none" id="C_0000000509-&gt;C_0000000501" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="31.83,183.88,38.345,176.4939,33.3295,179.1101,30.7132,174.0947,31.83,183.88" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="59" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="66" y="150.0669">aaa</text><!--MD5=[90cc5f5b8760e3a0e7c5d879f6d23b64]
-reverse link C_0000000509 to C_0000000503--><path d="M106.93,119.14 C104.54,125.03 102.5,131.04 101,137 C97.15,152.34 97.99,170.15 99.74,183.97 " fill="none" id="C_0000000509&lt;-C_0000000503" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="112.24,107.26,106.1415,111.1081,107.348,118.2176,113.4465,114.3695,112.24,107.26" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="107" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="114" y="150.0669">bbb</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="82.2269" y="127.373">0..1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="72.7015" y="172.9743">1..*</text><!--MD5=[cbbf0e52385e817fca9dc5991f69babd]
-reverse link C_0000000509 to C_0000000505--><path d="M159.09,119.78 C165.01,142.32 171.36,166.5 175.87,183.67 " fill="none" id="C_0000000509&lt;-C_0000000505" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="155.77,107.12,153.4245,113.939,158.8168,118.7268,161.1623,111.9078,155.77,107.12" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="174" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="181" y="150.0669">ccc</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="131.8783" y="127.2134">0..1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="147.4508" y="172.9945">1..5</text><!--MD5=[fccebb5b09c54119ffe9f9a687ad986e]
-link C_0000000509 to C_0000000507--><path d="M186.75,107.14 C195.02,116.86 203.45,127.12 211,137 C221.38,150.58 232.07,166.34 240.63,179.47 " fill="none" id="C_0000000509-&gt;C_0000000507" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="243.45,183.81,241.9012,174.0837,240.7261,179.6171,235.1926,178.442,243.45,183.81" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="229" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="236" y="150.0669">ddd</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="230.6966" y="172.7733">1</text><!--MD5=[5b772347e4caad1fcb2c1183f15a8f01]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:289px;height:243px;" version="1.1" viewBox="0 0 289 243" width="289px" zoomAndPan="magnify"><defs><filter height="300%" id="f1so06euds1vy8" 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></defs><g><!--MD5=[bfaa32ea6431fe369c7b9cf68da1ae25]
+class C_0000000572--><rect fill="#FEFECE" filter="url(#f1so06euds1vy8)" height="48" id="C_0000000572" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="184"/><ellipse cx="21" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M23.9688,205.6406 Q23.3906,205.9375 22.75,206.0781 Q22.1094,206.2344 21.4063,206.2344 Q18.9063,206.2344 17.5781,204.5938 Q16.2656,202.9375 16.2656,199.8125 Q16.2656,196.6875 17.5781,195.0313 Q18.9063,193.375 21.4063,193.375 Q22.1094,193.375 22.75,193.5313 Q23.4063,193.6875 23.9688,193.9844 L23.9688,196.7031 Q23.3438,196.125 22.75,195.8594 Q22.1563,195.5781 21.5313,195.5781 Q20.1875,195.5781 19.5,196.6563 Q18.8125,197.7188 18.8125,199.8125 Q18.8125,201.9063 19.5,202.9844 Q20.1875,204.0469 21.5313,204.0469 Q22.1563,204.0469 22.75,203.7813 Q23.3438,203.5 23.9688,202.9219 L23.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="204.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="224" y2="224"/><!--MD5=[4c2d7a1479f2c39dadafaa3145b8c921]
+class C_0000000574--><rect fill="#FEFECE" filter="url(#f1so06euds1vy8)" height="48" id="C_0000000574" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="184"/><ellipse cx="99" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M101.9688,205.6406 Q101.3906,205.9375 100.75,206.0781 Q100.1094,206.2344 99.4063,206.2344 Q96.9063,206.2344 95.5781,204.5938 Q94.2656,202.9375 94.2656,199.8125 Q94.2656,196.6875 95.5781,195.0313 Q96.9063,193.375 99.4063,193.375 Q100.1094,193.375 100.75,193.5313 Q101.4063,193.6875 101.9688,193.9844 L101.9688,196.7031 Q101.3438,196.125 100.75,195.8594 Q100.1563,195.5781 99.5313,195.5781 Q98.1875,195.5781 97.5,196.6563 Q96.8125,197.7188 96.8125,199.8125 Q96.8125,201.9063 97.5,202.9844 Q98.1875,204.0469 99.5313,204.0469 Q100.1563,204.0469 100.75,203.7813 Q101.3438,203.5 101.9688,202.9219 L101.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="204.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="224" y2="224"/><!--MD5=[d7647356f522fb8900f84fce79bb17d8]
+class C_0000000576--><rect fill="#FEFECE" filter="url(#f1so06euds1vy8)" height="48" id="C_0000000576" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="162" y="184"/><ellipse cx="177" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M179.9688,205.6406 Q179.3906,205.9375 178.75,206.0781 Q178.1094,206.2344 177.4063,206.2344 Q174.9063,206.2344 173.5781,204.5938 Q172.2656,202.9375 172.2656,199.8125 Q172.2656,196.6875 173.5781,195.0313 Q174.9063,193.375 177.4063,193.375 Q178.1094,193.375 178.75,193.5313 Q179.4063,193.6875 179.9688,193.9844 L179.9688,196.7031 Q179.3438,196.125 178.75,195.8594 Q178.1563,195.5781 177.5313,195.5781 Q176.1875,195.5781 175.5,196.6563 Q174.8125,197.7188 174.8125,199.8125 Q174.8125,201.9063 175.5,202.9844 Q176.1875,204.0469 177.5313,204.0469 Q178.1563,204.0469 178.75,203.7813 Q179.3438,203.5 179.9688,202.9219 L179.9688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="204.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="201" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="201" y1="224" y2="224"/><!--MD5=[3e2a4bc76add21b35825500a56d0bce2]
+class C_0000000578--><rect fill="#FEFECE" filter="url(#f1so06euds1vy8)" height="48" id="C_0000000578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="237.5" y="184"/><ellipse cx="252.5" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.4688,205.6406 Q254.8906,205.9375 254.25,206.0781 Q253.6094,206.2344 252.9063,206.2344 Q250.4063,206.2344 249.0781,204.5938 Q247.7656,202.9375 247.7656,199.8125 Q247.7656,196.6875 249.0781,195.0313 Q250.4063,193.375 252.9063,193.375 Q253.6094,193.375 254.25,193.5313 Q254.9063,193.6875 255.4688,193.9844 L255.4688,196.7031 Q254.8438,196.125 254.25,195.8594 Q253.6563,195.5781 253.0313,195.5781 Q251.6875,195.5781 251,196.6563 Q250.3125,197.7188 250.3125,199.8125 Q250.3125,201.9063 251,202.9844 Q251.6875,204.0469 253.0313,204.0469 Q253.6563,204.0469 254.25,203.7813 Q254.8438,203.5 255.4688,202.9219 L255.4688,205.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="266.5" y="204.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="238.5" x2="277.5" y1="216" y2="216"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="238.5" x2="277.5" y1="224" y2="224"/><!--MD5=[9b462980b106009a825b3f9c1b7156dc]
+class C_0000000580--><rect fill="#FEFECE" filter="url(#f1so06euds1vy8)" height="99.2188" id="C_0000000580" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/><ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/><ellipse cx="81" cy="51" 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="40" x="90" y="54.2104">aaa : A</text><ellipse cx="81" cy="63.8047" 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="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text><ellipse cx="81" cy="76.6094" 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="117" x="90" y="79.8198">ccc : std::vector&lt;C&gt;</text><ellipse cx="81" cy="89.4141" 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="41" x="90" y="92.6245">ddd : D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/><!--MD5=[696695d6e5ee75899c9aae780fa83368]
+link C_0000000580 to C_0000000572--><path d="M78.98,107.28 C69.45,116.44 60.37,126.47 53,137 C44.15,149.64 37.71,165.57 33.34,179.04 " fill="none" id="C_0000000580-&gt;C_0000000572" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="31.83,183.88,38.345,176.4939,33.3295,179.1101,30.7132,174.0947,31.83,183.88" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="59" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="66" y="150.0669">aaa</text><!--MD5=[dc99b81727bfb2f9a958d7d11341922c]
+reverse link C_0000000580 to C_0000000574--><path d="M106.93,119.14 C104.54,125.03 102.5,131.04 101,137 C97.15,152.34 97.99,170.15 99.74,183.97 " fill="none" id="C_0000000580&lt;-C_0000000574" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="112.24,107.26,106.1415,111.1081,107.348,118.2176,113.4465,114.3695,112.24,107.26" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="107" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="114" y="150.0669">bbb</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="82.2269" y="127.373">0..1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="72.7015" y="172.9743">1..*</text><!--MD5=[0da1fde9a70d45f48c8aad1af478beef]
+reverse link C_0000000580 to C_0000000576--><path d="M159.09,119.78 C165.01,142.32 171.36,166.5 175.87,183.67 " fill="none" id="C_0000000580&lt;-C_0000000576" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="155.77,107.12,153.4245,113.939,158.8168,118.7268,161.1623,111.9078,155.77,107.12" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="174" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="181" y="150.0669">ccc</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="131.8783" y="127.2134">0..1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="147.4508" y="172.9945">1..5</text><!--MD5=[1d78524f43b0dc0e810bbf9365446b42]
+link C_0000000580 to C_0000000578--><path d="M186.75,107.14 C195.02,116.86 203.45,127.12 211,137 C221.38,150.58 232.07,166.34 240.63,179.47 " fill="none" id="C_0000000580-&gt;C_0000000578" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="243.45,183.81,241.9012,174.0837,240.7261,179.6171,235.1926,178.442,243.45,183.81" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="229" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="236" y="150.0669">ddd</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="230.6966" y="172.7733">1</text><!--MD5=[df2b26a0a568bed1c6ff9632b7be1cdd]
 @startuml
-class "A" as C_0000000501
-class C_0000000501 {
+
+class "A" as C_0000000572
+class C_0000000572 {
 }
 
-class "B" as C_0000000503
-class C_0000000503 {
+class "B" as C_0000000574
+class C_0000000574 {
 }
 
-class "C" as C_0000000505
-class C_0000000505 {
+class "C" as C_0000000576
+class C_0000000576 {
 }
 
-class "D" as C_0000000507
-class C_0000000507 {
+class "D" as C_0000000578
+class C_0000000578 {
 }
 
-class "R" as C_0000000509
-class C_0000000509 {
+class "R" as C_0000000580
+class C_0000000580 {
 +aaa : A
 +bbb : std::vector<B>
 +ccc : std::vector<C>
 +ddd : D
 }
 
-C_0000000509 - -> C_0000000501 : +aaa
-C_0000000509 "0..1" *- - "1..*" C_0000000503 : +bbb
-C_0000000509 "0..1" o- - "1..5" C_0000000505 : +ccc
-C_0000000509 - -> "1" C_0000000507 : +ddd
+C_0000000580 - -> C_0000000572 : +aaa
+C_0000000580 "0..1" *- - "1..*" C_0000000574 : +bbb
+C_0000000580 "0..1" o- - "1..5" C_0000000576 : +ccc
+C_0000000580 - -> "1" C_0000000578 : +ddd
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 3909606d..175622b1 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,53 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:312px;height:402px;" version="1.1" viewBox="0 0 312 402" width="312px" zoomAndPan="magnify"><defs><linearGradient id="gcyqgs1gqa6bc0" 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="fcyqgs1gqa6bc" 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="gcyqgs1gqa6bc1" x1="0%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#0000FF"/><stop offset="100%" stop-color="#FF0000"/></linearGradient></defs><g><!--MD5=[bf86d991a8f8c53f15c0300376a78a73]
-class C_0000000515--><rect fill="url(#gcyqgs1gqa6bc0)" filter="url(#fcyqgs1gqa6bc)" height="48" id="C_0000000515" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/><rect fill="url(#gcyqgs1gqa6bc1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/><ellipse cx="21" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M23.9688,224.6406 Q23.3906,224.9375 22.75,225.0781 Q22.1094,225.2344 21.4063,225.2344 Q18.9063,225.2344 17.5781,223.5938 Q16.2656,221.9375 16.2656,218.8125 Q16.2656,215.6875 17.5781,214.0313 Q18.9063,212.375 21.4063,212.375 Q22.1094,212.375 22.75,212.5313 Q23.4063,212.6875 23.9688,212.9844 L23.9688,215.7031 Q23.3438,215.125 22.75,214.8594 Q22.1563,214.5781 21.5313,214.5781 Q20.1875,214.5781 19.5,215.6563 Q18.8125,216.7188 18.8125,218.8125 Q18.8125,220.9063 19.5,221.9844 Q20.1875,223.0469 21.5313,223.0469 Q22.1563,223.0469 22.75,222.7813 Q23.3438,222.5 23.9688,221.9219 L23.9688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="223.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="243" y2="243"/><!--MD5=[7d23df185b4cb853f2939aba30db7de0]
-class C_0000000517--><rect fill="#FEFECE" filter="url(#fcyqgs1gqa6bc)" height="86.4141" id="C_0000000517" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/><ellipse cx="98.9" cy="200" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/><path d="M103.0094,206 L95.2906,206 L95.2906,193.6094 L103.0094,193.6094 L103.0094,195.7656 L97.7438,195.7656 L97.7438,198.4375 L102.5094,198.4375 L102.5094,200.5938 L97.7438,200.5938 L97.7438,203.8438 L103.0094,203.8438 L103.0094,206 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.1" y="204.1543">B</text><line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="216" y2="216"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="89" y="230.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="243.0151">two</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="89" y="255.8198">three</text><line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="262.4141" y2="262.4141"/><!--MD5=[dea384331725ef65f698c51df7a2f4af]
-class C_0000000519--><rect fill="#FFC0CB" filter="url(#fcyqgs1gqa6bc)" height="60.8047" id="C_0000000519" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/><rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/><ellipse cx="257.2" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/><path d="M260.1688,352.6406 Q259.5906,352.9375 258.95,353.0781 Q258.3094,353.2344 257.6063,353.2344 Q255.1063,353.2344 253.7781,351.5938 Q252.4656,349.9375 252.4656,346.8125 Q252.4656,343.6875 253.7781,342.0313 Q255.1063,340.375 257.6063,340.375 Q258.3094,340.375 258.95,340.5313 Q259.6063,340.6875 260.1688,340.9844 L260.1688,343.7031 Q259.5438,343.125 258.95,342.8594 Q258.3563,342.5781 257.7313,342.5781 Q256.3875,342.5781 255.7,343.6563 Q255.0125,344.7188 255.0125,346.8125 Q255.0125,348.9063 255.7,349.9844 Q256.3875,351.0469 257.7313,351.0469 Q258.3563,351.0469 258.95,350.7813 Q259.5438,350.5 260.1688,349.9219 L260.1688,352.6406 Z "/><text fill="#FF0000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271.8" y="351.1543">C</text><rect fill="#FFC0CB" height="15.9688" style="stroke: #FF0000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="290.5" y="328"/><text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="291.5" y="340.1387">T</text><line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="363" y2="363"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="247.5" y="371"/><text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="259.5" y="377.2104">ttt : T</text><line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="383.8047" y2="383.8047"/><!--MD5=[68abbda8c01ab5b26890882bc1e9fcdb]
-class C_0000000521--><rect fill="#FEFECE" filter="url(#fcyqgs1gqa6bc)" height="48" id="C_0000000521" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/><ellipse cx="176.5" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M179.4688,224.6406 Q178.8906,224.9375 178.25,225.0781 Q177.6094,225.2344 176.9063,225.2344 Q174.4063,225.2344 173.0781,223.5938 Q171.7656,221.9375 171.7656,218.8125 Q171.7656,215.6875 173.0781,214.0313 Q174.4063,212.375 176.9063,212.375 Q177.6094,212.375 178.25,212.5313 Q178.9063,212.6875 179.4688,212.9844 L179.4688,215.7031 Q178.8438,215.125 178.25,214.8594 Q177.6563,214.5781 177.0313,214.5781 Q175.6875,214.5781 175,215.6563 Q174.3125,216.7188 174.3125,218.8125 Q174.3125,220.9063 175,221.9844 Q175.6875,223.0469 177.0313,223.0469 Q177.6563,223.0469 178.25,222.7813 Q178.8438,222.5 179.4688,221.9219 L179.4688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="190.5" y="223.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="243" y2="243"/><!--MD5=[f590865fa28947cd8577b8ec715df3db]
-class C_0000000525--><rect fill="#FEFECE" filter="url(#fcyqgs1gqa6bc)" height="48" id="C_0000000525" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/><ellipse cx="253" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.9688,224.6406 Q255.3906,224.9375 254.75,225.0781 Q254.1094,225.2344 253.4063,225.2344 Q250.9063,225.2344 249.5781,223.5938 Q248.2656,221.9375 248.2656,218.8125 Q248.2656,215.6875 249.5781,214.0313 Q250.9063,212.375 253.4063,212.375 Q254.1094,212.375 254.75,212.5313 Q255.4063,212.6875 255.9688,212.9844 L255.9688,215.7031 Q255.3438,215.125 254.75,214.8594 Q254.1563,214.5781 253.5313,214.5781 Q252.1875,214.5781 251.5,215.6563 Q250.8125,216.7188 250.8125,218.8125 Q250.8125,220.9063 251.5,221.9844 Q252.1875,223.0469 253.5313,223.0469 Q254.1563,223.0469 254.75,222.7813 Q255.3438,222.5 255.9688,221.9219 L255.9688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="267" y="223.1543">C</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="283" y="200"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="284" y="212.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="243" y2="243"/><!--MD5=[e843f5b7e2ef3222224ea14c87090f55]
-class C_0000000523--><rect fill="#FEFECE" filter="url(#fcyqgs1gqa6bc)" height="99.2188" id="C_0000000523" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/><ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/><ellipse cx="81" cy="51" 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="46" x="90" y="54.2104">aaa : A*</text><ellipse cx="81" cy="63.8047" 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="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text><ellipse cx="81" cy="76.6094" 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="70" x="90" y="79.8198">ccc : C&lt;int&gt;</text><ellipse cx="81" cy="89.4141" 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="47" x="90" y="92.6245">ddd : D*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/><!--MD5=[03ca92a5498be09032034508a59fc783]
-link C_0000000525 to C_0000000519--><path d="M268,251.08 C268,267.48 268,290.13 268,310.57 " fill="none" id="C_0000000525-&gt;C_0000000519" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="275,310.71,268,330.71,261,310.71,275,310.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[03157cf1549780329996daa7b46722d9]
-link C_0000000523 to C_0000000515--><path d="M77.85,107.27 C68.57,116.36 59.87,126.38 53,137 C41.06,155.47 34.18,179.47 30.36,197.9 " fill="none" id="C_0000000523-&gt;C_0000000515" style="stroke: #FF0000; stroke-width: 2.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#FF0000" points="29.36,202.94,35.0338,194.8897,30.3323,198.0355,27.1866,193.334,29.36,202.94" style="stroke: #FF0000; stroke-width: 2.0;"/><ellipse cx="59" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="66" y="150.0669">aaa</text><!--MD5=[dd8adb5a775bcea41b7c8f83cc82a217]
-reverse link C_0000000523 to C_0000000517--><path d="M106.93,119.14 C104.54,125.03 102.5,131.04 101,137 C97.24,152 96.88,168.86 97.83,183.84 " fill="none" id="C_0000000523&lt;-C_0000000517" style="stroke: #008000; stroke-width: 4.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#008000" points="112.24,107.26,106.1415,111.1081,107.348,118.2176,113.4465,114.3695,112.24,107.26" style="stroke: #008000; stroke-width: 4.0;"/><ellipse cx="107" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="114" y="150.0669">bbb</text><!--MD5=[95c0fe41348271d5f9fb8239ec88ae29]
-reverse link C_0000000523 to C_0000000525--><path d="M195.44,117.21 C200.83,123.78 206.11,130.46 211,137 C227.04,158.46 243.32,184.39 254.35,202.71 " fill="none" id="C_0000000523&lt;-C_0000000525" style="stroke: #0000FF; stroke-width: 8.0; stroke-dasharray: 1.0,3.0;"/><polygon fill="#FFFFFF" points="186.92,107.01,187.6973,114.1791,194.6139,116.2189,193.8366,109.0498,186.92,107.01" style="stroke: #0000FF; stroke-width: 8.0;"/><ellipse cx="229" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="236" y="150.0669">ccc</text><!--MD5=[259694bae42c1a598775976d8fec1e0a]
-link C_0000000523 to C_0000000521--><path d="M154.39,107.4 C161.23,136.79 169.69,173.14 175.43,197.8 " fill="none" id="C_0000000523-&gt;C_0000000521" style="stroke: #0000FF; stroke-width: 16.0;"/><polygon fill="#0000FF" points="176.62,202.88,178.4586,193.2043,175.478,198.0122,170.6701,195.0315,176.62,202.88" style="stroke: #0000FF; stroke-width: 16.0;"/><ellipse cx="171" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="178" y="150.0669">ddd</text><!--MD5=[a86921b29ee4fa676152d96f22b194c4]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:312px;height:402px;" version="1.1" viewBox="0 0 312 402" width="312px" zoomAndPan="magnify"><defs><linearGradient id="grpfqajizkx8r0" 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="frpfqajizkx8r" 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="grpfqajizkx8r1" x1="0%" x2="100%" y1="0%" y2="100%"><stop offset="0%" stop-color="#0000FF"/><stop offset="100%" stop-color="#FF0000"/></linearGradient></defs><g><!--MD5=[21abd59b07a07f4f0ca89629d5950a8d]
+class C_0000000588--><rect fill="url(#grpfqajizkx8r0)" filter="url(#frpfqajizkx8r)" height="48" id="C_0000000588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/><rect fill="url(#grpfqajizkx8r1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/><ellipse cx="21" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M23.9688,224.6406 Q23.3906,224.9375 22.75,225.0781 Q22.1094,225.2344 21.4063,225.2344 Q18.9063,225.2344 17.5781,223.5938 Q16.2656,221.9375 16.2656,218.8125 Q16.2656,215.6875 17.5781,214.0313 Q18.9063,212.375 21.4063,212.375 Q22.1094,212.375 22.75,212.5313 Q23.4063,212.6875 23.9688,212.9844 L23.9688,215.7031 Q23.3438,215.125 22.75,214.8594 Q22.1563,214.5781 21.5313,214.5781 Q20.1875,214.5781 19.5,215.6563 Q18.8125,216.7188 18.8125,218.8125 Q18.8125,220.9063 19.5,221.9844 Q20.1875,223.0469 21.5313,223.0469 Q22.1563,223.0469 22.75,222.7813 Q23.3438,222.5 23.9688,221.9219 L23.9688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="223.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="243" y2="243"/><!--MD5=[5b4ed508e9ed25246476fa8e2a41d785]
+class C_0000000590--><rect fill="#FEFECE" filter="url(#frpfqajizkx8r)" height="86.4141" id="C_0000000590" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/><ellipse cx="98.9" cy="200" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/><path d="M103.0094,206 L95.2906,206 L95.2906,193.6094 L103.0094,193.6094 L103.0094,195.7656 L97.7438,195.7656 L97.7438,198.4375 L102.5094,198.4375 L102.5094,200.5938 L97.7438,200.5938 L97.7438,203.8438 L103.0094,203.8438 L103.0094,206 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.1" y="204.1543">B</text><line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="216" y2="216"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="89" y="230.2104">one</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="243.0151">two</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="89" y="255.8198">three</text><line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="262.4141" y2="262.4141"/><!--MD5=[20f1404279a0745ea37e2f02bc9e3cc0]
+class C_0000000592--><rect fill="#FFC0CB" filter="url(#frpfqajizkx8r)" height="60.8047" id="C_0000000592" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/><rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/><ellipse cx="257.2" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/><path d="M260.1688,352.6406 Q259.5906,352.9375 258.95,353.0781 Q258.3094,353.2344 257.6063,353.2344 Q255.1063,353.2344 253.7781,351.5938 Q252.4656,349.9375 252.4656,346.8125 Q252.4656,343.6875 253.7781,342.0313 Q255.1063,340.375 257.6063,340.375 Q258.3094,340.375 258.95,340.5313 Q259.6063,340.6875 260.1688,340.9844 L260.1688,343.7031 Q259.5438,343.125 258.95,342.8594 Q258.3563,342.5781 257.7313,342.5781 Q256.3875,342.5781 255.7,343.6563 Q255.0125,344.7188 255.0125,346.8125 Q255.0125,348.9063 255.7,349.9844 Q256.3875,351.0469 257.7313,351.0469 Q258.3563,351.0469 258.95,350.7813 Q259.5438,350.5 260.1688,349.9219 L260.1688,352.6406 Z "/><text fill="#FF0000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271.8" y="351.1543">C</text><rect fill="#FFC0CB" height="15.9688" style="stroke: #FF0000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="290.5" y="328"/><text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="291.5" y="340.1387">T</text><line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="363" y2="363"/><rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="247.5" y="371"/><text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="259.5" y="377.2104">ttt : T</text><line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="383.8047" y2="383.8047"/><!--MD5=[3d47f75e76ddff5b710b4088700ba5e1]
+class C_0000000594--><rect fill="#FEFECE" filter="url(#frpfqajizkx8r)" height="48" id="C_0000000594" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/><ellipse cx="176.5" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M179.4688,224.6406 Q178.8906,224.9375 178.25,225.0781 Q177.6094,225.2344 176.9063,225.2344 Q174.4063,225.2344 173.0781,223.5938 Q171.7656,221.9375 171.7656,218.8125 Q171.7656,215.6875 173.0781,214.0313 Q174.4063,212.375 176.9063,212.375 Q177.6094,212.375 178.25,212.5313 Q178.9063,212.6875 179.4688,212.9844 L179.4688,215.7031 Q178.8438,215.125 178.25,214.8594 Q177.6563,214.5781 177.0313,214.5781 Q175.6875,214.5781 175,215.6563 Q174.3125,216.7188 174.3125,218.8125 Q174.3125,220.9063 175,221.9844 Q175.6875,223.0469 177.0313,223.0469 Q177.6563,223.0469 178.25,222.7813 Q178.8438,222.5 179.4688,221.9219 L179.4688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="190.5" y="223.1543">D</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="243" y2="243"/><!--MD5=[82cc10afdbffaafac0fb42c81d7cea9b]
+class C_0000000598--><rect fill="#FEFECE" filter="url(#frpfqajizkx8r)" height="48" id="C_0000000598" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/><ellipse cx="253" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M255.9688,224.6406 Q255.3906,224.9375 254.75,225.0781 Q254.1094,225.2344 253.4063,225.2344 Q250.9063,225.2344 249.5781,223.5938 Q248.2656,221.9375 248.2656,218.8125 Q248.2656,215.6875 249.5781,214.0313 Q250.9063,212.375 253.4063,212.375 Q254.1094,212.375 254.75,212.5313 Q255.4063,212.6875 255.9688,212.9844 L255.9688,215.7031 Q255.3438,215.125 254.75,214.8594 Q254.1563,214.5781 253.5313,214.5781 Q252.1875,214.5781 251.5,215.6563 Q250.8125,216.7188 250.8125,218.8125 Q250.8125,220.9063 251.5,221.9844 Q252.1875,223.0469 253.5313,223.0469 Q254.1563,223.0469 254.75,222.7813 Q255.3438,222.5 255.9688,221.9219 L255.9688,224.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="267" y="223.1543">C</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="283" y="200"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="284" y="212.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="235" y2="235"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="243" y2="243"/><!--MD5=[129d58d09165d7dfb6f8db4b3af54137]
+class C_0000000596--><rect fill="#FEFECE" filter="url(#frpfqajizkx8r)" height="99.2188" id="C_0000000596" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/><ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/><ellipse cx="81" cy="51" 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="46" x="90" y="54.2104">aaa : A*</text><ellipse cx="81" cy="63.8047" 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="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text><ellipse cx="81" cy="76.6094" 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="70" x="90" y="79.8198">ccc : C&lt;int&gt;</text><ellipse cx="81" cy="89.4141" 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="47" x="90" y="92.6245">ddd : D*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/><!--MD5=[6fc45c136f3902d6209893d98430755b]
+link C_0000000598 to C_0000000592--><path d="M268,251.08 C268,267.48 268,290.13 268,310.57 " fill="none" id="C_0000000598-&gt;C_0000000592" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="275,310.71,268,330.71,261,310.71,275,310.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[516e0600a66c76f16e05b5cb6cf6fdfb]
+link C_0000000596 to C_0000000588--><path d="M77.85,107.27 C68.57,116.36 59.87,126.38 53,137 C41.06,155.47 34.18,179.47 30.36,197.9 " fill="none" id="C_0000000596-&gt;C_0000000588" style="stroke: #FF0000; stroke-width: 2.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#FF0000" points="29.36,202.94,35.0338,194.8897,30.3323,198.0355,27.1866,193.334,29.36,202.94" style="stroke: #FF0000; stroke-width: 2.0;"/><ellipse cx="59" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="66" y="150.0669">aaa</text><!--MD5=[352de3fa14bfed68c69c4aba1ab72b09]
+reverse link C_0000000596 to C_0000000590--><path d="M106.93,119.14 C104.54,125.03 102.5,131.04 101,137 C97.24,152 96.88,168.86 97.83,183.84 " fill="none" id="C_0000000596&lt;-C_0000000590" style="stroke: #008000; stroke-width: 4.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#008000" points="112.24,107.26,106.1415,111.1081,107.348,118.2176,113.4465,114.3695,112.24,107.26" style="stroke: #008000; stroke-width: 4.0;"/><ellipse cx="107" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="114" y="150.0669">bbb</text><!--MD5=[f56460f47efd02b13d102424cee0156f]
+reverse link C_0000000596 to C_0000000598--><path d="M195.44,117.21 C200.83,123.78 206.11,130.46 211,137 C227.04,158.46 243.32,184.39 254.35,202.71 " fill="none" id="C_0000000596&lt;-C_0000000598" style="stroke: #0000FF; stroke-width: 8.0; stroke-dasharray: 1.0,3.0;"/><polygon fill="#FFFFFF" points="186.92,107.01,187.6973,114.1791,194.6139,116.2189,193.8366,109.0498,186.92,107.01" style="stroke: #0000FF; stroke-width: 8.0;"/><ellipse cx="229" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="236" y="150.0669">ccc</text><!--MD5=[66087f616fc9164dac06e573bef71197]
+link C_0000000596 to C_0000000594--><path d="M154.39,107.4 C161.23,136.79 169.69,173.14 175.43,197.8 " fill="none" id="C_0000000596-&gt;C_0000000594" style="stroke: #0000FF; stroke-width: 16.0;"/><polygon fill="#0000FF" points="176.62,202.88,178.4586,193.2043,175.478,198.0122,170.6701,195.0315,176.62,202.88" style="stroke: #0000FF; stroke-width: 16.0;"/><ellipse cx="171" cy="146.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="178" y="150.0669">ddd</text><!--MD5=[d2343379a2f19b0a942b07e0e571cf38]
 @startuml
-class "A" as C_0000000515
-class C_0000000515 #back:lightgreen|yellow;header:blue/red {
+
+class "A" as C_0000000588
+class C_0000000588 #back:lightgreen|yellow;header:blue/red {
 }
 
-enum "B" as C_0000000517
-enum C_0000000517 #line.dotted:blue {
+enum "B" as C_0000000590
+enum C_0000000590 #line.dotted:blue {
 one
 two
 three
 }
 
-class "C<T>" as C_0000000519
-class C_0000000519 #pink;line:red;line.bold;text:red {
+class "C<T>" as C_0000000592
+class C_0000000592 #pink;line:red;line.bold;text:red {
 -ttt : T
 }
 
-class "D" as C_0000000521
-class C_0000000521 {
+class "D" as C_0000000594
+class C_0000000594 {
 }
 
-class "C<int>" as C_0000000525
-class C_0000000525 {
+class "C<int>" as C_0000000598
+class C_0000000598 {
 }
 
-class "R" as C_0000000523
-class C_0000000523 {
+class "R" as C_0000000596
+class C_0000000596 {
 +aaa : A*
 +bbb : std::vector<B>
 +ccc : C<int>
 +ddd : D*
 }
 
-C_0000000525 ..|> C_0000000519
-C_0000000523 -[#red,dashed,thickness=2]-> C_0000000515 : +aaa
-C_0000000523 *-[#green,dashed,thickness=4]- C_0000000517 : +bbb
-C_0000000523 o-[#blue,dotted,thickness=8]- C_0000000525 : +ccc
-C_0000000523 -[#blue,plain,thickness=16]-> C_0000000521 : +ddd
+C_0000000598 ..|> C_0000000592
+C_0000000596 -[#red,dashed,thickness=2]-> C_0000000588 : +aaa
+C_0000000596 *-[#green,dashed,thickness=4]- C_0000000590 : +bbb
+C_0000000596 o-[#blue,dotted,thickness=8]- C_0000000598 : +ccc
+C_0000000596 -[#blue,plain,thickness=16]-> C_0000000594 : +ddd
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 583ad19e..ce226d29 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,72 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:743px;height:326px;" version="1.1" viewBox="0 0 743 326" width="743px" zoomAndPan="magnify"><defs><filter height="300%" id="f1tpr60aes1a58" 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></defs><g><!--MD5=[e807177209298335ce43ee2d98fd7f27]
-class C_0000000529--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="48" id="C_0000000529" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/><ellipse cx="58.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M61.4688,167.6406 Q60.8906,167.9375 60.25,168.0781 Q59.6094,168.2344 58.9063,168.2344 Q56.4063,168.2344 55.0781,166.5938 Q53.7656,164.9375 53.7656,161.8125 Q53.7656,158.6875 55.0781,157.0313 Q56.4063,155.375 58.9063,155.375 Q59.6094,155.375 60.25,155.5313 Q60.9063,155.6875 61.4688,155.9844 L61.4688,158.7031 Q60.8438,158.125 60.25,157.8594 Q59.6563,157.5781 59.0313,157.5781 Q57.6875,157.5781 57,158.6563 Q56.3125,159.7188 56.3125,161.8125 Q56.3125,163.9063 57,164.9844 Q57.6875,166.0469 59.0313,166.0469 Q59.6563,166.0469 60.25,165.7813 Q60.8438,165.5 61.4688,164.9219 L61.4688,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="72.5" y="166.1543">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="186" y2="186"/><!--MD5=[6b2c284f9504b066bde283e7f86eefd3]
-class C_0000000531--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="48" id="C_0000000531" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/><ellipse cx="194" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M196.9688,283.1406 Q196.3906,283.4375 195.75,283.5781 Q195.1094,283.7344 194.4063,283.7344 Q191.9063,283.7344 190.5781,282.0938 Q189.2656,280.4375 189.2656,277.3125 Q189.2656,274.1875 190.5781,272.5313 Q191.9063,270.875 194.4063,270.875 Q195.1094,270.875 195.75,271.0313 Q196.4063,271.1875 196.9688,271.4844 L196.9688,274.2031 Q196.3438,273.625 195.75,273.3594 Q195.1563,273.0781 194.5313,273.0781 Q193.1875,273.0781 192.5,274.1563 Q191.8125,275.2188 191.8125,277.3125 Q191.8125,279.4063 192.5,280.4844 Q193.1875,281.5469 194.5313,281.5469 Q195.1563,281.5469 195.75,281.2813 Q196.3438,281 196.9688,280.4219 L196.9688,283.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="208" y="281.6543">TBase</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="293.5" y2="293.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="301.5" y2="301.5"/><!--MD5=[3861ce5490807e3de5f5fdad03ae2ca0]
-class C_0000000533--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="60.8047" id="C_0000000533" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/><ellipse cx="338.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.7188,276.6406 Q341.1406,276.9375 340.5,277.0781 Q339.8594,277.2344 339.1563,277.2344 Q336.6563,277.2344 335.3281,275.5938 Q334.0156,273.9375 334.0156,270.8125 Q334.0156,267.6875 335.3281,266.0313 Q336.6563,264.375 339.1563,264.375 Q339.8594,264.375 340.5,264.5313 Q341.1563,264.6875 341.7188,264.9844 L341.7188,267.7031 Q341.0938,267.125 340.5,266.8594 Q339.9063,266.5781 339.2813,266.5781 Q337.9375,266.5781 337.25,267.6563 Q336.5625,268.7188 336.5625,270.8125 Q336.5625,272.9063 337.25,273.9844 Q337.9375,275.0469 339.2813,275.0469 Q339.9063,275.0469 340.5,274.7813 Q341.0938,274.5 341.7188,273.9219 L341.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="275.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="409" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="409" y1="295" y2="295"/><ellipse cx="295" cy="306" 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="100" x="304" y="309.2104">operator()() : void</text><!--MD5=[e510d7bdbd22eb2bdd54bd1845f00954]
-class C_0000000535--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="60.8047" id="C_0000000535" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/><ellipse cx="499.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M502.7188,276.6406 Q502.1406,276.9375 501.5,277.0781 Q500.8594,277.2344 500.1563,277.2344 Q497.6563,277.2344 496.3281,275.5938 Q495.0156,273.9375 495.0156,270.8125 Q495.0156,267.6875 496.3281,266.0313 Q497.6563,264.375 500.1563,264.375 Q500.8594,264.375 501.5,264.5313 Q502.1563,264.6875 502.7188,264.9844 L502.7188,267.7031 Q502.0938,267.125 501.5,266.8594 Q500.9063,266.5781 500.2813,266.5781 Q498.9375,266.5781 498.25,267.6563 Q497.5625,268.7188 497.5625,270.8125 Q497.5625,272.9063 498.25,273.9844 Q498.9375,275.0469 500.2813,275.0469 Q500.9063,275.0469 501.5,274.7813 Q502.0938,274.5 502.7188,273.9219 L502.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="520.25" y="275.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="446" x2="570" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="446" x2="570" y1="295" y2="295"/><ellipse cx="456" cy="306" 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="100" x="465" y="309.2104">operator()() : void</text><!--MD5=[9ffb455963caff7c3844017d1d46eeb5]
-class C_0000000537--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="60.8047" id="C_0000000537" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/><ellipse cx="660.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M663.7188,276.6406 Q663.1406,276.9375 662.5,277.0781 Q661.8594,277.2344 661.1563,277.2344 Q658.6563,277.2344 657.3281,275.5938 Q656.0156,273.9375 656.0156,270.8125 Q656.0156,267.6875 657.3281,266.0313 Q658.6563,264.375 661.1563,264.375 Q661.8594,264.375 662.5,264.5313 Q663.1563,264.6875 663.7188,264.9844 L663.7188,267.7031 Q663.0938,267.125 662.5,266.8594 Q661.9063,266.5781 661.2813,266.5781 Q659.9375,266.5781 659.25,267.6563 Q658.5625,268.7188 658.5625,270.8125 Q658.5625,272.9063 659.25,273.9844 Q659.9375,275.0469 661.2813,275.0469 Q661.9063,275.0469 662.5,274.7813 Q663.0938,274.5 663.7188,273.9219 L663.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="681.25" y="275.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="607" x2="731" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="607" x2="731" y1="295" y2="295"/><ellipse cx="617" cy="306" 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="100" x="626" y="309.2104">operator()() : void</text><!--MD5=[bab358c5639da8d9bc74ed0700a8ba04]
-class C_0000000539--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="60.8047" id="C_0000000539" style="stroke: #A80036; stroke-width: 1.5;" width="138" 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="55" x="35" y="275.1543">Overload</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="98" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="99" y="264.1387">T,L,Ts...</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="287" y2="287"/><ellipse cx="17" cy="298" 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="61" x="26" y="301.2104">counter : L</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="307.8047" y2="307.8047"/><!--MD5=[a3c3d606e8e97e24256184e20a51459c]
-class C_0000000542--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="48" id="C_0000000542" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/><ellipse cx="270" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M272.9688,167.6406 Q272.3906,167.9375 271.75,168.0781 Q271.1094,168.2344 270.4063,168.2344 Q267.9063,168.2344 266.5781,166.5938 Q265.2656,164.9375 265.2656,161.8125 Q265.2656,158.6875 266.5781,157.0313 Q267.9063,155.375 270.4063,155.375 Q271.1094,155.375 271.75,155.5313 Q272.4063,155.6875 272.9688,155.9844 L272.9688,158.7031 Q272.3438,158.125 271.75,157.8594 Q271.1563,157.5781 270.5313,157.5781 Q269.1875,157.5781 268.5,158.6563 Q267.8125,159.7188 267.8125,161.8125 Q267.8125,163.9063 268.5,164.9844 Q269.1875,166.0469 270.5313,166.0469 Q271.1563,166.0469 271.75,165.7813 Q272.3438,165.5 272.9688,164.9219 L272.9688,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="284" y="166.1543">Overload</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="347" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="348" y="155.1387">TBase,int,A,B,C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="186" y2="186"/><!--MD5=[e6ea2253c2ac19de75571e55a42a241d]
-class C_0000000541--><rect fill="#FEFECE" filter="url(#f1tpr60aes1a58)" height="60.8047" id="C_0000000541" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/><ellipse cx="338.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.7188,29.6406 Q341.1406,29.9375 340.5,30.0781 Q339.8594,30.2344 339.1563,30.2344 Q336.6563,30.2344 335.3281,28.5938 Q334.0156,26.9375 334.0156,23.8125 Q334.0156,20.6875 335.3281,19.0313 Q336.6563,17.375 339.1563,17.375 Q339.8594,17.375 340.5,17.5313 Q341.1563,17.6875 341.7188,17.9844 L341.7188,20.7031 Q341.0938,20.125 340.5,19.8594 Q339.9063,19.5781 339.2813,19.5781 Q337.9375,19.5781 337.25,20.6563 Q336.5625,21.7188 336.5625,23.8125 Q336.5625,25.9063 337.25,26.9844 Q337.9375,28.0469 339.2813,28.0469 Q339.9063,28.0469 340.5,27.7813 Q341.0938,27.5 341.7188,26.9219 L341.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="40" y2="40"/><ellipse cx="235.5" cy="51" 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="219" x="244.5" y="54.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="60.8047" y2="60.8047"/><!--MD5=[caa79d82754fa414929d2534edb84c0b]
-reverse link C_0000000529 to C_0000000539--><path d="M75,214.65 C75,228.08 75,242.54 75,254.81 " fill="none" id="C_0000000529&lt;-C_0000000539" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="68,214.24,75,194.24,82,214.24,68,214.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1ef4ea06bedee4d44598c62c1b123aac]
-reverse link C_0000000531 to C_0000000542--><path d="M265,251.54 C288.34,233.18 314.2,210.76 330.91,194.24 " fill="none" id="C_0000000531&lt;-C_0000000542" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="269.15,257.19,249,263.77,260.65,246.06,269.15,257.19" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8df7afa56f5b91e19d43e3784dda33d5]
-link C_0000000542 to C_0000000531--><path d="M309.24,194.24 C284.94,212.6 254.71,238.26 234.57,257.52 " fill="none" id="C_0000000542-&gt;C_0000000531" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="230.68,261.29,239.9351,257.9222,234.2792,257.8193,234.3821,252.1634,230.68,261.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[75bbba3b6ec0176d009dbd693cdd869c]
-reverse link C_0000000533 to C_0000000542--><path d="M360.42,234.43 C360.77,220.42 360.01,205.87 358.14,194.24 " fill="none" id="C_0000000533&lt;-C_0000000542" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="367.37,235.33,359.03,254.81,353.4,234.38,367.37,235.33" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0dfd02aabfcf12f93658ec74af6f5fca]
-link C_0000000542 to C_0000000533--><path d="M336.48,194.24 C334.05,210.25 333.61,231.8 335.15,249.82 " fill="none" id="C_0000000542-&gt;C_0000000533" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="335.64,254.81,338.7459,245.4637,335.1538,249.8337,330.7838,246.2416,335.64,254.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dae52dd16284b821df642ceb3b54e13d]
-reverse link C_0000000535 to C_0000000542--><path d="M461.83,242.73 C439.56,226.36 413.15,208.2 391.11,194.24 " fill="none" id="C_0000000535&lt;-C_0000000542" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="466.12,237.2,477.91,254.81,457.71,248.4,466.12,237.2" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f366df4dc5450c70fcddfc91a525a22a]
-link C_0000000542 to C_0000000535--><path d="M369.45,194.24 C390.5,210.86 422.18,233.46 450.07,251.89 " fill="none" id="C_0000000542-&gt;C_0000000535" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="454.51,254.81,449.1876,246.5231,450.3322,252.063,444.7924,253.2076,454.51,254.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ca012b929f812e570261f5aa1f6f0cf0]
-reverse link C_0000000537 to C_0000000542--><path d="M587.47,248.04 C533.69,228.95 475.39,208.88 429.43,194.01 " fill="none" id="C_0000000537&lt;-C_0000000542" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="590.17,241.57,606.66,254.88,585.47,254.76,590.17,241.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3ff6984028c1b8a71a3d56dfb415c48c]
-link C_0000000542 to C_0000000537--><path d="M400.22,194.01 C446.02,210.7 513.17,233.95 572,255 C581.22,258.3 591.02,261.87 600.78,265.34 " fill="none" id="C_0000000542-&gt;C_0000000537" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="605.56,267.03,598.414,260.2525,600.8474,265.3592,595.7407,267.7926,605.56,267.03" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4263366bec929ae3027f6398bdc5eda2]
-link C_0000000542 to C_0000000539--><path d="M291.63,194.11 C254.64,209.54 205.19,230.17 162.88,247.83 " fill="none" id="C_0000000542-&gt;C_0000000539" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="165.47,254.33,144.32,255.57,160.08,241.41,165.47,254.33" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[30f45cae30fcaa6d40d91852f7529469]
-reverse link C_0000000541 to C_0000000542--><path d="M347,82.5 C347,103.65 347,128.32 347,145.88 " fill="none" id="C_0000000541&lt;-C_0000000542" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="347,69.21,343,75.21,347,81.21,351,75.21,347,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="353" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="360" y="112.0669">overload</text><!--MD5=[5b955df49933250f3c995cfb806e5e30]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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:743px;height:326px;" version="1.1" viewBox="0 0 743 326" width="743px" zoomAndPan="magnify"><defs><filter height="300%" id="fhhnub41376pe" 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></defs><g><!--MD5=[add189f9c011e846a3823662927cd650]
+class C_0000000604--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="48" id="C_0000000604" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/><ellipse cx="58.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M61.4688,167.6406 Q60.8906,167.9375 60.25,168.0781 Q59.6094,168.2344 58.9063,168.2344 Q56.4063,168.2344 55.0781,166.5938 Q53.7656,164.9375 53.7656,161.8125 Q53.7656,158.6875 55.0781,157.0313 Q56.4063,155.375 58.9063,155.375 Q59.6094,155.375 60.25,155.5313 Q60.9063,155.6875 61.4688,155.9844 L61.4688,158.7031 Q60.8438,158.125 60.25,157.8594 Q59.6563,157.5781 59.0313,157.5781 Q57.6875,157.5781 57,158.6563 Q56.3125,159.7188 56.3125,161.8125 Q56.3125,163.9063 57,164.9844 Q57.6875,166.0469 59.0313,166.0469 Q59.6563,166.0469 60.25,165.7813 Q60.8438,165.5 61.4688,164.9219 L61.4688,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="72.5" y="166.1543">Base</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="186" y2="186"/><!--MD5=[cf28b30aebd4c60dcdd53f8c6cd535da]
+class C_0000000606--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="48" id="C_0000000606" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/><ellipse cx="194" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M196.9688,283.1406 Q196.3906,283.4375 195.75,283.5781 Q195.1094,283.7344 194.4063,283.7344 Q191.9063,283.7344 190.5781,282.0938 Q189.2656,280.4375 189.2656,277.3125 Q189.2656,274.1875 190.5781,272.5313 Q191.9063,270.875 194.4063,270.875 Q195.1094,270.875 195.75,271.0313 Q196.4063,271.1875 196.9688,271.4844 L196.9688,274.2031 Q196.3438,273.625 195.75,273.3594 Q195.1563,273.0781 194.5313,273.0781 Q193.1875,273.0781 192.5,274.1563 Q191.8125,275.2188 191.8125,277.3125 Q191.8125,279.4063 192.5,280.4844 Q193.1875,281.5469 194.5313,281.5469 Q195.1563,281.5469 195.75,281.2813 Q196.3438,281 196.9688,280.4219 L196.9688,283.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="208" y="281.6543">TBase</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="293.5" y2="293.5"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="301.5" y2="301.5"/><!--MD5=[5d7f8ad12651a7bc3277b9101d0705cf]
+class C_0000000608--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="60.8047" id="C_0000000608" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/><ellipse cx="338.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.7188,276.6406 Q341.1406,276.9375 340.5,277.0781 Q339.8594,277.2344 339.1563,277.2344 Q336.6563,277.2344 335.3281,275.5938 Q334.0156,273.9375 334.0156,270.8125 Q334.0156,267.6875 335.3281,266.0313 Q336.6563,264.375 339.1563,264.375 Q339.8594,264.375 340.5,264.5313 Q341.1563,264.6875 341.7188,264.9844 L341.7188,267.7031 Q341.0938,267.125 340.5,266.8594 Q339.9063,266.5781 339.2813,266.5781 Q337.9375,266.5781 337.25,267.6563 Q336.5625,268.7188 336.5625,270.8125 Q336.5625,272.9063 337.25,273.9844 Q337.9375,275.0469 339.2813,275.0469 Q339.9063,275.0469 340.5,274.7813 Q341.0938,274.5 341.7188,273.9219 L341.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="275.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="409" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="409" y1="295" y2="295"/><ellipse cx="295" cy="306" 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="100" x="304" y="309.2104">operator()() : void</text><!--MD5=[cd460aa2c4d75b461db6199b300560cd]
+class C_0000000610--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="60.8047" id="C_0000000610" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/><ellipse cx="499.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M502.7188,276.6406 Q502.1406,276.9375 501.5,277.0781 Q500.8594,277.2344 500.1563,277.2344 Q497.6563,277.2344 496.3281,275.5938 Q495.0156,273.9375 495.0156,270.8125 Q495.0156,267.6875 496.3281,266.0313 Q497.6563,264.375 500.1563,264.375 Q500.8594,264.375 501.5,264.5313 Q502.1563,264.6875 502.7188,264.9844 L502.7188,267.7031 Q502.0938,267.125 501.5,266.8594 Q500.9063,266.5781 500.2813,266.5781 Q498.9375,266.5781 498.25,267.6563 Q497.5625,268.7188 497.5625,270.8125 Q497.5625,272.9063 498.25,273.9844 Q498.9375,275.0469 500.2813,275.0469 Q500.9063,275.0469 501.5,274.7813 Q502.0938,274.5 502.7188,273.9219 L502.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="520.25" y="275.1543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="446" x2="570" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="446" x2="570" y1="295" y2="295"/><ellipse cx="456" cy="306" 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="100" x="465" y="309.2104">operator()() : void</text><!--MD5=[6dd4f920f3a01f8c1abd6025da965b8b]
+class C_0000000612--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="60.8047" id="C_0000000612" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/><ellipse cx="660.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M663.7188,276.6406 Q663.1406,276.9375 662.5,277.0781 Q661.8594,277.2344 661.1563,277.2344 Q658.6563,277.2344 657.3281,275.5938 Q656.0156,273.9375 656.0156,270.8125 Q656.0156,267.6875 657.3281,266.0313 Q658.6563,264.375 661.1563,264.375 Q661.8594,264.375 662.5,264.5313 Q663.1563,264.6875 663.7188,264.9844 L663.7188,267.7031 Q663.0938,267.125 662.5,266.8594 Q661.9063,266.5781 661.2813,266.5781 Q659.9375,266.5781 659.25,267.6563 Q658.5625,268.7188 658.5625,270.8125 Q658.5625,272.9063 659.25,273.9844 Q659.9375,275.0469 661.2813,275.0469 Q661.9063,275.0469 662.5,274.7813 Q663.0938,274.5 663.7188,273.9219 L663.7188,276.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="681.25" y="275.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="607" x2="731" y1="287" y2="287"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="607" x2="731" y1="295" y2="295"/><ellipse cx="617" cy="306" 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="100" x="626" y="309.2104">operator()() : void</text><!--MD5=[0dba764f6be374f31b854009458221ec]
+class C_0000000614--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="60.8047" id="C_0000000614" style="stroke: #A80036; stroke-width: 1.5;" width="138" 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="55" x="35" y="275.1543">Overload</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="98" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="99" y="264.1387">T,L,Ts...</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="287" y2="287"/><ellipse cx="17" cy="298" 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="61" x="26" y="301.2104">counter : L</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="307.8047" y2="307.8047"/><!--MD5=[82d5aa32ddee12dc0e733092f6f8e0d8]
+class C_0000000617--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="48" id="C_0000000617" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/><ellipse cx="270" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M272.9688,167.6406 Q272.3906,167.9375 271.75,168.0781 Q271.1094,168.2344 270.4063,168.2344 Q267.9063,168.2344 266.5781,166.5938 Q265.2656,164.9375 265.2656,161.8125 Q265.2656,158.6875 266.5781,157.0313 Q267.9063,155.375 270.4063,155.375 Q271.1094,155.375 271.75,155.5313 Q272.4063,155.6875 272.9688,155.9844 L272.9688,158.7031 Q272.3438,158.125 271.75,157.8594 Q271.1563,157.5781 270.5313,157.5781 Q269.1875,157.5781 268.5,158.6563 Q267.8125,159.7188 267.8125,161.8125 Q267.8125,163.9063 268.5,164.9844 Q269.1875,166.0469 270.5313,166.0469 Q271.1563,166.0469 271.75,165.7813 Q272.3438,165.5 272.9688,164.9219 L272.9688,167.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="284" y="166.1543">Overload</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="347" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="348" y="155.1387">TBase,int,A,B,C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="178" y2="178"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="186" y2="186"/><!--MD5=[dff666e60a76347ea14d30be285cbbc5]
+class C_0000000616--><rect fill="#FEFECE" filter="url(#fhhnub41376pe)" height="60.8047" id="C_0000000616" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/><ellipse cx="338.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M341.7188,29.6406 Q341.1406,29.9375 340.5,30.0781 Q339.8594,30.2344 339.1563,30.2344 Q336.6563,30.2344 335.3281,28.5938 Q334.0156,26.9375 334.0156,23.8125 Q334.0156,20.6875 335.3281,19.0313 Q336.6563,17.375 339.1563,17.375 Q339.8594,17.375 340.5,17.5313 Q341.1563,17.6875 341.7188,17.9844 L341.7188,20.7031 Q341.0938,20.125 340.5,19.8594 Q339.9063,19.5781 339.2813,19.5781 Q337.9375,19.5781 337.25,20.6563 Q336.5625,21.7188 336.5625,23.8125 Q336.5625,25.9063 337.25,26.9844 Q337.9375,28.0469 339.2813,28.0469 Q339.9063,28.0469 340.5,27.7813 Q341.0938,27.5 341.7188,26.9219 L341.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="40" y2="40"/><ellipse cx="235.5" cy="51" 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="219" x="244.5" y="54.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="60.8047" y2="60.8047"/><!--MD5=[56fd93f4d09dcbe566583afaf778c3cf]
+reverse link C_0000000604 to C_0000000614--><path d="M75,214.65 C75,228.08 75,242.54 75,254.81 " fill="none" id="C_0000000604&lt;-C_0000000614" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="68,214.24,75,194.24,82,214.24,68,214.24" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0e74a48f078fb293318eebd3df4d44dc]
+link C_0000000617 to C_0000000606--><path d="M309.24,194.24 C284.94,212.6 254.71,238.26 234.57,257.52 " fill="none" id="C_0000000617-&gt;C_0000000606" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="230.68,261.29,239.9351,257.9222,234.2792,257.8193,234.3821,252.1634,230.68,261.29" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bd54181ddf12872cb9aec9be828e8d33]
+reverse link C_0000000606 to C_0000000617--><path d="M265,251.54 C288.34,233.18 314.2,210.76 330.91,194.24 " fill="none" id="C_0000000606&lt;-C_0000000617" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="269.15,257.19,249,263.77,260.65,246.06,269.15,257.19" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[9e28e0872aa1f5bd158a6262fcb9db0c]
+link C_0000000617 to C_0000000608--><path d="M336.48,194.24 C334.05,210.25 333.61,231.8 335.15,249.82 " fill="none" id="C_0000000617-&gt;C_0000000608" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="335.64,254.81,338.7459,245.4637,335.1538,249.8337,330.7838,246.2416,335.64,254.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[21db66fd2a512d876c0e02b057f866fc]
+reverse link C_0000000608 to C_0000000617--><path d="M360.42,234.43 C360.77,220.42 360.01,205.87 358.14,194.24 " fill="none" id="C_0000000608&lt;-C_0000000617" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="367.37,235.33,359.03,254.81,353.4,234.38,367.37,235.33" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1972c17a51e8ac1f53888c25ed73c334]
+link C_0000000617 to C_0000000610--><path d="M369.45,194.24 C390.5,210.86 422.18,233.46 450.07,251.89 " fill="none" id="C_0000000617-&gt;C_0000000610" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="454.51,254.81,449.1876,246.5231,450.3322,252.063,444.7924,253.2076,454.51,254.81" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ddda2b82fdb57d60df9474001a42f656]
+reverse link C_0000000610 to C_0000000617--><path d="M461.83,242.73 C439.56,226.36 413.15,208.2 391.11,194.24 " fill="none" id="C_0000000610&lt;-C_0000000617" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="466.12,237.2,477.91,254.81,457.71,248.4,466.12,237.2" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[48be4a8b7c4965b2ba6ee58d1c7d03c2]
+link C_0000000617 to C_0000000612--><path d="M400.22,194.01 C446.02,210.7 513.17,233.95 572,255 C581.22,258.3 591.02,261.87 600.78,265.34 " fill="none" id="C_0000000617-&gt;C_0000000612" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="605.56,267.03,598.414,260.2525,600.8474,265.3592,595.7407,267.7926,605.56,267.03" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5ddbd100361909e2e65beef197d8989a]
+reverse link C_0000000612 to C_0000000617--><path d="M587.47,248.04 C533.69,228.95 475.39,208.88 429.43,194.01 " fill="none" id="C_0000000612&lt;-C_0000000617" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="none" points="590.17,241.57,606.66,254.88,585.47,254.76,590.17,241.57" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a6573ca247cb784e009ee1a77489b05c]
+link C_0000000617 to C_0000000614--><path d="M291.63,194.11 C254.64,209.54 205.19,230.17 162.88,247.83 " fill="none" id="C_0000000617-&gt;C_0000000614" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="165.47,254.33,144.32,255.57,160.08,241.41,165.47,254.33" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[13d16791b4f4913bb2cb4fd168f6b714]
+reverse link C_0000000616 to C_0000000617--><path d="M347,82.5 C347,103.65 347,128.32 347,145.88 " fill="none" id="C_0000000616&lt;-C_0000000617" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="347,69.21,343,75.21,347,81.21,351,75.21,347,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="353" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="360" y="112.0669">overload</text><!--MD5=[325df6f96531aac9f3ac935f523fa65c]
 @startuml
-class "Base" as C_0000000529
-class C_0000000529 {
+
+class "Base" as C_0000000604
+class C_0000000604 {
 }
 
-class "TBase" as C_0000000531
-class C_0000000531 {
+class "TBase" as C_0000000606
+class C_0000000606 {
 }
 
-class "A" as C_0000000533
-class C_0000000533 {
+class "A" as C_0000000608
+class C_0000000608 {
 +operator()() : void
 }
 
-class "B" as C_0000000535
-class C_0000000535 {
+class "B" as C_0000000610
+class C_0000000610 {
 +operator()() : void
 }
 
-class "C" as C_0000000537
-class C_0000000537 {
+class "C" as C_0000000612
+class C_0000000612 {
 +operator()() : void
 }
 
-class "Overload<T,L,Ts...>" as C_0000000539
-class C_0000000539 {
+class "Overload<T,L,Ts...>" as C_0000000614
+class C_0000000614 {
 +counter : L
 }
-C_0000000529 <|- - C_0000000539
 
-class "Overload<TBase,int,A,B,C>" as C_0000000542
-class C_0000000542 {
+class "Overload<TBase,int,A,B,C>" as C_0000000617
+class C_0000000617 {
 }
-C_0000000531 <|- - C_0000000542
-C_0000000533 <|- - C_0000000542
-C_0000000535 <|- - C_0000000542
-C_0000000537 <|- - C_0000000542
 
-class "R" as C_0000000541
-class C_0000000541 {
+class "R" as C_0000000616
+class C_0000000616 {
 +overload : Overload<TBase,int,A,B,C>
 }
 
-C_0000000542 ..> C_0000000531
-C_0000000542 ..> C_0000000533
-C_0000000542 ..> C_0000000535
-C_0000000542 ..> C_0000000537
-C_0000000542 ..|> C_0000000539
-C_0000000541 o- - C_0000000542 : +overload
+C_0000000604 <|- - C_0000000614
+C_0000000617 ..> C_0000000606
+C_0000000617 ..> C_0000000608
+C_0000000617 ..> C_0000000610
+C_0000000617 ..> C_0000000612
+C_0000000617 ..|> C_0000000614
+C_0000000606 <|- - C_0000000617
+C_0000000608 <|- - C_0000000617
+C_0000000610 <|- - C_0000000617
+C_0000000612 <|- - C_0000000617
+C_0000000616 o- - C_0000000617 : +overload
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 302f6c6d..3f2ba4d5 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,64 +1,65 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f10ftn44eg66kh" 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></defs><g><!--MD5=[b7ea69fafc0cb1316f2979e19b07a855]
-class C_0000000545--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="60.8047" id="C_0000000545" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="136.5" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="137.5" y="264.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/><ellipse cx="87.5" cy="298" 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="40" x="96.5" y="301.2104">aaa : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="307.8047" y2="307.8047"/><!--MD5=[b9a40bc152dbce34b8005a53bde3285d]
-class C_0000000547--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="60.8047" id="C_0000000547" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="268.5" y="374"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="269.5" y="386.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/><ellipse cx="219.5" cy="420" 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="40" x="228.5" y="423.2104">bbb : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="429.8047" y2="429.8047"/><!--MD5=[f417822da8071bfcbca1d76cdf52a946]
-class C_0000000549--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="60.8047" id="C_0000000549" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="310" y="496"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="311" y="508.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/><ellipse cx="264" cy="542" 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="37" x="273" y="545.2104">ccc : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="551.8047" y2="551.8047"/><!--MD5=[f91aff5efe06893b08c6591d95787b02]
-class C_0000000551--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="60.8047" id="C_0000000551" 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"/><ellipse cx="362" cy="542" 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="47" x="371" y="545.2104">ddd : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="551.8047" y2="551.8047"/><!--MD5=[9032e37594c9c656e270fc51eae69af6]
-class C_0000000557--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="48" id="C_0000000557" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="11" x="355" y="380.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="356" y="392.6387">D</text><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"/><!--MD5=[15044a19723824380793133786a72fe7]
-class C_0000000555--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="48" id="C_0000000555" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="153" x="223" y="258.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="270.6387">std::unique_ptr&lt;C&lt;D&gt;&gt;</text><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"/><!--MD5=[8b1219752732ae8ea5b44447b7a5f76a]
-class C_0000000554--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="48" id="C_0000000554" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="181" x="63" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="179" x="64" y="155.1387">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text><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"/><!--MD5=[2a5a0fd4953d289a224ae7deb6627640]
-class C_0000000553--><rect fill="#FEFECE" filter="url(#f10ftn44eg66kh)" height="60.8047" id="C_0000000553" 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"/><ellipse cx="17" cy="51" 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="221" x="26" y="54.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="60.8047" y2="60.8047"/><!--MD5=[c4720d6dc9c60a8c98ad7146a04e9ca7]
-link C_0000000557 to C_0000000551--><path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0000000557-&gt;C_0000000551" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="374.79,498.61,374.9472,488.7624,372.8325,494.0091,367.5858,491.8944,374.79,498.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1e125f3bbbcf5385fada2afc0f07ac66]
-link C_0000000557 to C_0000000549--><path d="M326.47,431.64 C320.5,445.42 312.69,463.44 305.44,480.19 " fill="none" id="C_0000000557-&gt;C_0000000549" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="311.83,483.04,297.45,498.61,298.98,477.47,311.83,483.04" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[0ef1a182147f3e3a5fe6e6b1a3238855]
-link C_0000000555 to C_0000000557--><path d="M287.26,309.64 C297.3,329.39 311.77,357.85 322.43,378.81 " fill="none" id="C_0000000555-&gt;C_0000000557" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="324.77,383.43,324.2474,373.595,322.4997,378.9751,317.1196,377.2274,324.77,383.43" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[3a187c21e1a90d1c583babe8857a133c]
-link C_0000000555 to C_0000000547--><path d="M268.94,309.64 C265.12,323.12 260.16,340.66 255.5,357.1 " fill="none" id="C_0000000555-&gt;C_0000000547" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="262.16,359.27,249.97,376.61,248.69,355.45,262.16,359.27" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d429c4364b54f358868512497b3821d0]
-link C_0000000554 to C_0000000555--><path d="M159.4,194.24 C183.29,212.82 216.79,238.86 241.66,258.2 " fill="none" id="C_0000000554-&gt;C_0000000555" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="245.89,261.48,241.2329,252.8018,241.9402,258.4142,236.3277,259.1215,245.89,261.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[59817266590908c0160c6dab30fbe40c]
-link C_0000000554 to C_0000000545--><path d="M125.4,194.24 C123.33,206.01 120.73,220.77 118.24,234.92 " fill="none" id="C_0000000554-&gt;C_0000000545" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="125.1,236.32,114.73,254.81,111.31,233.89,125.1,236.32" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[14f61a2dbe57c45d70565cf9efd39fac]
-reverse link C_0000000553 to C_0000000554--><path d="M129.5,82.5 C129.5,103.65 129.5,128.32 129.5,145.88 " fill="none" id="C_0000000553&lt;-C_0000000554" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="129.5,69.21,125.5,75.21,129.5,81.21,133.5,75.21,129.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="135.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="142.5" y="112.0669">abc</text><!--MD5=[de56a8ed5176e68e10db4ec13455e2b8]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1onl5kkv07zdp" 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></defs><g><!--MD5=[0faa93e6a264ed5f0116c9a44d1f2d71]
+class C_0000000622--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="60.8047" id="C_0000000622" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="136.5" y="252"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="137.5" y="264.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/><ellipse cx="87.5" cy="298" 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="40" x="96.5" y="301.2104">aaa : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="307.8047" y2="307.8047"/><!--MD5=[5ad113678e3f62fc3635d9581ad8c096]
+class C_0000000624--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="60.8047" id="C_0000000624" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="268.5" y="374"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="269.5" y="386.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/><ellipse cx="219.5" cy="420" 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="40" x="228.5" y="423.2104">bbb : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="429.8047" y2="429.8047"/><!--MD5=[f2586e06e432188cd42075e013bdda78]
+class C_0000000626--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="60.8047" id="C_0000000626" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="310" y="496"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="311" y="508.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/><ellipse cx="264" cy="542" 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="37" x="273" y="545.2104">ccc : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="551.8047" y2="551.8047"/><!--MD5=[7f77548010a2da1c0f81dd3ee18d2c27]
+class C_0000000628--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="60.8047" id="C_0000000628" 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"/><ellipse cx="362" cy="542" 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="47" x="371" y="545.2104">ddd : int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="551.8047" y2="551.8047"/><!--MD5=[c119feea6b7cb88834bdc1565b295d62]
+class C_0000000634--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="48" id="C_0000000634" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="11" x="355" y="380.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="356" y="392.6387">D</text><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"/><!--MD5=[29a12c4d7480b4186c9353012fb897ab]
+class C_0000000632--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="48" id="C_0000000632" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="153" x="223" y="258.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="270.6387">std::unique_ptr&lt;C&lt;D&gt;&gt;</text><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"/><!--MD5=[fda3404d92a669df8e7420cb2d397670]
+class C_0000000631--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="48" id="C_0000000631" 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><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="181" x="63" y="143"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="179" x="64" y="155.1387">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text><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"/><!--MD5=[f576461e4d557677e69e30a3636d1e88]
+class C_0000000630--><rect fill="#FEFECE" filter="url(#f1onl5kkv07zdp)" height="60.8047" id="C_0000000630" 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"/><ellipse cx="17" cy="51" 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="221" x="26" y="54.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="60.8047" y2="60.8047"/><!--MD5=[4905ec20dc4d758f1140d3a4ad53bc24]
+link C_0000000634 to C_0000000628--><path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0000000634-&gt;C_0000000628" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="374.79,498.61,374.9472,488.7624,372.8325,494.0091,367.5858,491.8944,374.79,498.61" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[74a390e4dd4834773ce3f119dba4fe9b]
+link C_0000000634 to C_0000000626--><path d="M326.47,431.64 C320.5,445.42 312.69,463.44 305.44,480.19 " fill="none" id="C_0000000634-&gt;C_0000000626" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="311.83,483.04,297.45,498.61,298.98,477.47,311.83,483.04" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6a3a7309e6750c54cfb3c9666eaac39b]
+link C_0000000632 to C_0000000634--><path d="M287.26,309.64 C297.3,329.39 311.77,357.85 322.43,378.81 " fill="none" id="C_0000000632-&gt;C_0000000634" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="324.77,383.43,324.2474,373.595,322.4997,378.9751,317.1196,377.2274,324.77,383.43" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c938a0916eb84d57f8a1feddd1df516a]
+link C_0000000632 to C_0000000624--><path d="M268.94,309.64 C265.12,323.12 260.16,340.66 255.5,357.1 " fill="none" id="C_0000000632-&gt;C_0000000624" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="262.16,359.27,249.97,376.61,248.69,355.45,262.16,359.27" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f156a4d7ba0b6fa07ece52d8f0d929a1]
+link C_0000000631 to C_0000000632--><path d="M159.4,194.24 C183.29,212.82 216.79,238.86 241.66,258.2 " fill="none" id="C_0000000631-&gt;C_0000000632" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="245.89,261.48,241.2329,252.8018,241.9402,258.4142,236.3277,259.1215,245.89,261.48" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1b83d2b085cdb1b0379e9b87b26d0236]
+link C_0000000631 to C_0000000622--><path d="M125.4,194.24 C123.33,206.01 120.73,220.77 118.24,234.92 " fill="none" id="C_0000000631-&gt;C_0000000622" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="125.1,236.32,114.73,254.81,111.31,233.89,125.1,236.32" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[82e2c071e3af30ad57ba87545ba731f3]
+reverse link C_0000000630 to C_0000000631--><path d="M129.5,82.5 C129.5,103.65 129.5,128.32 129.5,145.88 " fill="none" id="C_0000000630&lt;-C_0000000631" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="129.5,69.21,125.5,75.21,129.5,81.21,133.5,75.21,129.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="135.5" cy="108.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="142.5" y="112.0669">abc</text><!--MD5=[29de9af91d019a416e0c8966ab809f49]
 @startuml
-class "A<T>" as C_0000000545
-class C_0000000545 {
+
+class "A<T>" as C_0000000622
+class C_0000000622 {
 +aaa : T
 }
 
-class "B<T>" as C_0000000547
-class C_0000000547 {
+class "B<T>" as C_0000000624
+class C_0000000624 {
 +bbb : T
 }
 
-class "C<T>" as C_0000000549
-class C_0000000549 {
+class "C<T>" as C_0000000626
+class C_0000000626 {
 +ccc : T
 }
 
-class "D" as C_0000000551
-class C_0000000551 {
+class "D" as C_0000000628
+class C_0000000628 {
 +ddd : int
 }
 
-class "C<D>" as C_0000000557
-class C_0000000557 {
+class "C<D>" as C_0000000634
+class C_0000000634 {
 }
 
-class "B<std::unique_ptr<C<D>>>" as C_0000000555
-class C_0000000555 {
+class "B<std::unique_ptr<C<D>>>" as C_0000000632
+class C_0000000632 {
 }
 
-class "A<B<std::unique_ptr<C<D>>>>" as C_0000000554
-class C_0000000554 {
+class "A<B<std::unique_ptr<C<D>>>>" as C_0000000631
+class C_0000000631 {
 }
 
-class "R" as C_0000000553
-class C_0000000553 {
+class "R" as C_0000000630
+class C_0000000630 {
 +abc : A<B<std::unique_ptr<C<D>>>>
 }
 
-C_0000000557 ..> C_0000000551
-C_0000000557 ..|> C_0000000549
-C_0000000555 ..> C_0000000557
-C_0000000555 ..|> C_0000000547
-C_0000000554 ..> C_0000000555
-C_0000000554 ..|> C_0000000545
-C_0000000553 o- - C_0000000554 : +abc
+C_0000000634 ..> C_0000000628
+C_0000000634 ..|> C_0000000626
+C_0000000632 ..> C_0000000634
+C_0000000632 ..|> C_0000000624
+C_0000000631 ..> C_0000000632
+C_0000000631 ..|> C_0000000622
+C_0000000630 o- - C_0000000631 : +abc
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index bd902f1a..a06629a6 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:744px;height:218px;" version="1.1" viewBox="0 0 744 218" width="744px" zoomAndPan="magnify"><defs><filter height="300%" id="f2mnj2yqnbxu4" 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></defs><g><!--MD5=[f21ce6ed4892c999fecb8d6b6fe28d76]
-class C_0000000563--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="73.6094" id="C_0000000563" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="8"/><ellipse cx="110.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M113.7188,29.6406 Q113.1406,29.9375 112.5,30.0781 Q111.8594,30.2344 111.1563,30.2344 Q108.6563,30.2344 107.3281,28.5938 Q106.0156,26.9375 106.0156,23.8125 Q106.0156,20.6875 107.3281,19.0313 Q108.6563,17.375 111.1563,17.375 Q111.8594,17.375 112.5,17.5313 Q113.1563,17.6875 113.7188,17.9844 L113.7188,20.7031 Q113.0938,20.125 112.5,19.8594 Q111.9063,19.5781 111.2813,19.5781 Q109.9375,19.5781 109.25,20.6563 Q108.5625,21.7188 108.5625,23.8125 Q108.5625,25.9063 109.25,26.9844 Q109.9375,28.0469 111.2813,28.0469 Q111.9063,28.0469 112.5,27.7813 Q113.0938,27.5 113.7188,26.9219 L113.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="131.25" y="28.1543">Void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="48" y2="48"/><ellipse cx="17" cy="59" 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="219" x="26" y="62.2104">operator==(Void const&amp; ) const : bool</text><ellipse cx="17" cy="71.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="213" x="26" y="75.0151">operator!=(Void const&amp; ) const : bool</text><!--MD5=[fa49d05e3fbecf53f2a4dbf11d534f95]
-class C_0000000565--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="48" id="C_0000000565" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="295" y="159"/><ellipse cx="310" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M312.9688,180.6406 Q312.3906,180.9375 311.75,181.0781 Q311.1094,181.2344 310.4063,181.2344 Q307.9063,181.2344 306.5781,179.5938 Q305.2656,177.9375 305.2656,174.8125 Q305.2656,171.6875 306.5781,170.0313 Q307.9063,168.375 310.4063,168.375 Q311.1094,168.375 311.75,168.5313 Q312.4063,168.6875 312.9688,168.9844 L312.9688,171.7031 Q312.3438,171.125 311.75,170.8594 Q311.1563,170.5781 310.5313,170.5781 Q309.1875,170.5781 308.5,171.6563 Q307.8125,172.7188 307.8125,174.8125 Q307.8125,176.9063 308.5,177.9844 Q309.1875,179.0469 310.5313,179.0469 Q311.1563,179.0469 311.75,178.7813 Q312.3438,178.5 312.9688,177.9219 L312.9688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="324" y="179.1543">lift_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="378" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="379" y="168.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="296" x2="383" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="296" x2="383" y1="199" y2="199"/><!--MD5=[2ecf531d64d5220b4b0566ab275f21e3]
-class C_0000000567--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="48" id="C_0000000567" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="286" y="21"/><ellipse cx="301" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M303.9688,42.6406 Q303.3906,42.9375 302.75,43.0781 Q302.1094,43.2344 301.4063,43.2344 Q298.9063,43.2344 297.5781,41.5938 Q296.2656,39.9375 296.2656,36.8125 Q296.2656,33.6875 297.5781,32.0313 Q298.9063,30.375 301.4063,30.375 Q302.1094,30.375 302.75,30.5313 Q303.4063,30.6875 303.9688,30.9844 L303.9688,33.7031 Q303.3438,33.125 302.75,32.8594 Q302.1563,32.5781 301.5313,32.5781 Q300.1875,32.5781 299.5,33.6563 Q298.8125,34.7188 298.8125,36.8125 Q298.8125,38.9063 299.5,39.9844 Q300.1875,41.0469 301.5313,41.0469 Q302.1563,41.0469 302.75,40.7813 Q303.3438,40.5 303.9688,39.9219 L303.9688,42.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="315" y="41.1543">lift_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="369" y="18"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="370" y="30.1387">void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="392" y1="53" y2="53"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="392" y1="61" y2="61"/><!--MD5=[a21b83cdee2b61df3c69f0519cfe97bb]
-class C_0000000571--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="48" id="C_0000000571" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="438" y="159"/><ellipse cx="453" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M455.9688,180.6406 Q455.3906,180.9375 454.75,181.0781 Q454.1094,181.2344 453.4063,181.2344 Q450.9063,181.2344 449.5781,179.5938 Q448.2656,177.9375 448.2656,174.8125 Q448.2656,171.6875 449.5781,170.0313 Q450.9063,168.375 453.4063,168.375 Q454.1094,168.375 454.75,168.5313 Q455.4063,168.6875 455.9688,168.9844 L455.9688,171.7031 Q455.3438,171.125 454.75,170.8594 Q454.1563,170.5781 453.5313,170.5781 Q452.1875,170.5781 451.5,171.6563 Q450.8125,172.7188 450.8125,174.8125 Q450.8125,176.9063 451.5,177.9844 Q452.1875,179.0469 453.5313,179.0469 Q454.1563,179.0469 454.75,178.7813 Q455.3438,178.5 455.9688,177.9219 L455.9688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="467" y="179.1543">drop_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="535" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="536" y="168.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="439" x2="540" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="439" x2="540" y1="199" y2="199"/><!--MD5=[23e9cdb7fcc4e832bf318f929ecd48e6]
-class C_0000000573--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="48" id="C_0000000573" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="428" y="21"/><ellipse cx="443" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M445.9688,42.6406 Q445.3906,42.9375 444.75,43.0781 Q444.1094,43.2344 443.4063,43.2344 Q440.9063,43.2344 439.5781,41.5938 Q438.2656,39.9375 438.2656,36.8125 Q438.2656,33.6875 439.5781,32.0313 Q440.9063,30.375 443.4063,30.375 Q444.1094,30.375 444.75,30.5313 Q445.4063,30.6875 445.9688,30.9844 L445.9688,33.7031 Q445.3438,33.125 444.75,32.8594 Q444.1563,32.5781 443.5313,32.5781 Q442.1875,32.5781 441.5,33.6563 Q440.8125,34.7188 440.8125,36.8125 Q440.8125,38.9063 441.5,39.9844 Q442.1875,41.0469 443.5313,41.0469 Q444.1563,41.0469 444.75,40.7813 Q445.3438,40.5 445.9688,39.9219 L445.9688,42.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="457" y="41.1543">drop_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="525" y="18"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="526" y="30.1387">Void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="429" x2="550" y1="53" y2="53"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="429" x2="550" y1="61" y2="61"/><!--MD5=[0e66f4d944a637edfab1422d3b3dff21]
-class C_0000000577--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="48" id="C_0000000577" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="639.5" y="159"/><ellipse cx="654.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M657.4688,180.6406 Q656.8906,180.9375 656.25,181.0781 Q655.6094,181.2344 654.9063,181.2344 Q652.4063,181.2344 651.0781,179.5938 Q649.7656,177.9375 649.7656,174.8125 Q649.7656,171.6875 651.0781,170.0313 Q652.4063,168.375 654.9063,168.375 Q655.6094,168.375 656.25,168.5313 Q656.9063,168.6875 657.4688,168.9844 L657.4688,171.7031 Q656.8438,171.125 656.25,170.8594 Q655.6563,170.5781 655.0313,170.5781 Q653.6875,170.5781 653,171.6563 Q652.3125,172.7188 652.3125,174.8125 Q652.3125,176.9063 653,177.9844 Q653.6875,179.0469 655.0313,179.0469 Q655.6563,179.0469 656.25,178.7813 Q656.8438,178.5 657.4688,177.9219 L657.4688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="668.5" y="179.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="640.5" x2="678.5" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="640.5" x2="678.5" y1="199" y2="199"/><!--MD5=[ad7ac8de4945b8f61f02efdea18e3dc1]
-class C_0000000579--><rect fill="#FEFECE" filter="url(#f2mnj2yqnbxu4)" height="73.6094" id="C_0000000579" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="586" y="8"/><ellipse cx="651.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M654.2188,29.6406 Q653.6406,29.9375 653,30.0781 Q652.3594,30.2344 651.6563,30.2344 Q649.1563,30.2344 647.8281,28.5938 Q646.5156,26.9375 646.5156,23.8125 Q646.5156,20.6875 647.8281,19.0313 Q649.1563,17.375 651.6563,17.375 Q652.3594,17.375 653,17.5313 Q653.6563,17.6875 654.2188,17.9844 L654.2188,20.7031 Q653.5938,20.125 653,19.8594 Q652.4063,19.5781 651.7813,19.5781 Q650.4375,19.5781 649.75,20.6563 Q649.0625,21.7188 649.0625,23.8125 Q649.0625,25.9063 649.75,26.9844 Q650.4375,28.0469 651.7813,28.0469 Q652.4063,28.0469 653,27.7813 Q653.5938,27.5 654.2188,26.9219 L654.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="671.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="587" x2="732" y1="40" y2="40"/><ellipse cx="597" cy="51" 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="106" x="606" y="54.2104">la : lift_void_t&lt;A&gt;*</text><ellipse cx="597" cy="63.8047" 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="121" x="606" y="67.0151">lv : lift_void_t&lt;void&gt;*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="587" x2="732" y1="73.6094" y2="73.6094"/><!--MD5=[7c2c46de6d45bf499746fa110ae2aa3e]
-link C_0000000567 to C_0000000565--><path d="M339.5,69.07 C339.5,88.12 339.5,115.68 339.5,138.81 " fill="none" id="C_0000000567-&gt;C_0000000565" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="346.5,138.82,339.5,158.82,332.5,138.82,346.5,138.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[571585555ac05905b1848c5145a1edc5]
-link C_0000000573 to C_0000000571--><path d="M489.5,69.07 C489.5,88.12 489.5,115.68 489.5,138.81 " fill="none" id="C_0000000573-&gt;C_0000000571" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="496.5,138.82,489.5,158.82,482.5,138.82,496.5,138.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b94d46752964b2b66b767ed6dcca017c]
-link C_0000000579 to C_0000000577--><path d="M659.5,82.09 C659.5,104.43 659.5,132.72 659.5,153.49 " fill="none" id="C_0000000579-&gt;C_0000000577" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="659.5,158.6,663.5,149.6,659.5,153.6,655.5,149.6,659.5,158.6" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="665.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="11" x="672.5" y="125.0669">la</text><!--MD5=[90d29a1852b0ec0277b350f95f3cfd26]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:744px;height:218px;" version="1.1" viewBox="0 0 744 218" width="744px" zoomAndPan="magnify"><defs><filter height="300%" id="f1h4e6dmexzfad" 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></defs><g><!--MD5=[f93ea72ed29dac858a59b3df46d62778]
+class C_0000000642--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="73.6094" id="C_0000000642" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="8"/><ellipse cx="110.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M113.7188,29.6406 Q113.1406,29.9375 112.5,30.0781 Q111.8594,30.2344 111.1563,30.2344 Q108.6563,30.2344 107.3281,28.5938 Q106.0156,26.9375 106.0156,23.8125 Q106.0156,20.6875 107.3281,19.0313 Q108.6563,17.375 111.1563,17.375 Q111.8594,17.375 112.5,17.5313 Q113.1563,17.6875 113.7188,17.9844 L113.7188,20.7031 Q113.0938,20.125 112.5,19.8594 Q111.9063,19.5781 111.2813,19.5781 Q109.9375,19.5781 109.25,20.6563 Q108.5625,21.7188 108.5625,23.8125 Q108.5625,25.9063 109.25,26.9844 Q109.9375,28.0469 111.2813,28.0469 Q111.9063,28.0469 112.5,27.7813 Q113.0938,27.5 113.7188,26.9219 L113.7188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="131.25" y="28.1543">Void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="40" y2="40"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="48" y2="48"/><ellipse cx="17" cy="59" 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="219" x="26" y="62.2104">operator==(Void const&amp; ) const : bool</text><ellipse cx="17" cy="71.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="213" x="26" y="75.0151">operator!=(Void const&amp; ) const : bool</text><!--MD5=[62291d27aab929199a4840a1b6e9dddb]
+class C_0000000644--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="48" id="C_0000000644" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="295" y="159"/><ellipse cx="310" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M312.9688,180.6406 Q312.3906,180.9375 311.75,181.0781 Q311.1094,181.2344 310.4063,181.2344 Q307.9063,181.2344 306.5781,179.5938 Q305.2656,177.9375 305.2656,174.8125 Q305.2656,171.6875 306.5781,170.0313 Q307.9063,168.375 310.4063,168.375 Q311.1094,168.375 311.75,168.5313 Q312.4063,168.6875 312.9688,168.9844 L312.9688,171.7031 Q312.3438,171.125 311.75,170.8594 Q311.1563,170.5781 310.5313,170.5781 Q309.1875,170.5781 308.5,171.6563 Q307.8125,172.7188 307.8125,174.8125 Q307.8125,176.9063 308.5,177.9844 Q309.1875,179.0469 310.5313,179.0469 Q311.1563,179.0469 311.75,178.7813 Q312.3438,178.5 312.9688,177.9219 L312.9688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="324" y="179.1543">lift_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="378" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="379" y="168.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="296" x2="383" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="296" x2="383" y1="199" y2="199"/><!--MD5=[534dac319959349f917b78536c306adf]
+class C_0000000646--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="48" id="C_0000000646" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="286" y="21"/><ellipse cx="301" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M303.9688,42.6406 Q303.3906,42.9375 302.75,43.0781 Q302.1094,43.2344 301.4063,43.2344 Q298.9063,43.2344 297.5781,41.5938 Q296.2656,39.9375 296.2656,36.8125 Q296.2656,33.6875 297.5781,32.0313 Q298.9063,30.375 301.4063,30.375 Q302.1094,30.375 302.75,30.5313 Q303.4063,30.6875 303.9688,30.9844 L303.9688,33.7031 Q303.3438,33.125 302.75,32.8594 Q302.1563,32.5781 301.5313,32.5781 Q300.1875,32.5781 299.5,33.6563 Q298.8125,34.7188 298.8125,36.8125 Q298.8125,38.9063 299.5,39.9844 Q300.1875,41.0469 301.5313,41.0469 Q302.1563,41.0469 302.75,40.7813 Q303.3438,40.5 303.9688,39.9219 L303.9688,42.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="315" y="41.1543">lift_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="369" y="18"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="370" y="30.1387">void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="392" y1="53" y2="53"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="392" y1="61" y2="61"/><!--MD5=[46d2083cda323d146bcdfeb422d9e61c]
+class C_0000000650--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="48" id="C_0000000650" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="438" y="159"/><ellipse cx="453" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M455.9688,180.6406 Q455.3906,180.9375 454.75,181.0781 Q454.1094,181.2344 453.4063,181.2344 Q450.9063,181.2344 449.5781,179.5938 Q448.2656,177.9375 448.2656,174.8125 Q448.2656,171.6875 449.5781,170.0313 Q450.9063,168.375 453.4063,168.375 Q454.1094,168.375 454.75,168.5313 Q455.4063,168.6875 455.9688,168.9844 L455.9688,171.7031 Q455.3438,171.125 454.75,170.8594 Q454.1563,170.5781 453.5313,170.5781 Q452.1875,170.5781 451.5,171.6563 Q450.8125,172.7188 450.8125,174.8125 Q450.8125,176.9063 451.5,177.9844 Q452.1875,179.0469 453.5313,179.0469 Q454.1563,179.0469 454.75,178.7813 Q455.3438,178.5 455.9688,177.9219 L455.9688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="467" y="179.1543">drop_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="535" y="156"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="536" y="168.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="439" x2="540" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="439" x2="540" y1="199" y2="199"/><!--MD5=[19d191e0425bea47f76450a6907f13e7]
+class C_0000000652--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="48" id="C_0000000652" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="428" y="21"/><ellipse cx="443" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M445.9688,42.6406 Q445.3906,42.9375 444.75,43.0781 Q444.1094,43.2344 443.4063,43.2344 Q440.9063,43.2344 439.5781,41.5938 Q438.2656,39.9375 438.2656,36.8125 Q438.2656,33.6875 439.5781,32.0313 Q440.9063,30.375 443.4063,30.375 Q444.1094,30.375 444.75,30.5313 Q445.4063,30.6875 445.9688,30.9844 L445.9688,33.7031 Q445.3438,33.125 444.75,32.8594 Q444.1563,32.5781 443.5313,32.5781 Q442.1875,32.5781 441.5,33.6563 Q440.8125,34.7188 440.8125,36.8125 Q440.8125,38.9063 441.5,39.9844 Q442.1875,41.0469 443.5313,41.0469 Q444.1563,41.0469 444.75,40.7813 Q445.3438,40.5 445.9688,39.9219 L445.9688,42.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="457" y="41.1543">drop_void</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="525" y="18"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="526" y="30.1387">Void</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="429" x2="550" y1="53" y2="53"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="429" x2="550" y1="61" y2="61"/><!--MD5=[5b93035215d720a15685628e22652fb6]
+class C_0000000656--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="48" id="C_0000000656" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="639.5" y="159"/><ellipse cx="654.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M657.4688,180.6406 Q656.8906,180.9375 656.25,181.0781 Q655.6094,181.2344 654.9063,181.2344 Q652.4063,181.2344 651.0781,179.5938 Q649.7656,177.9375 649.7656,174.8125 Q649.7656,171.6875 651.0781,170.0313 Q652.4063,168.375 654.9063,168.375 Q655.6094,168.375 656.25,168.5313 Q656.9063,168.6875 657.4688,168.9844 L657.4688,171.7031 Q656.8438,171.125 656.25,170.8594 Q655.6563,170.5781 655.0313,170.5781 Q653.6875,170.5781 653,171.6563 Q652.3125,172.7188 652.3125,174.8125 Q652.3125,176.9063 653,177.9844 Q653.6875,179.0469 655.0313,179.0469 Q655.6563,179.0469 656.25,178.7813 Q656.8438,178.5 657.4688,177.9219 L657.4688,180.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="668.5" y="179.1543">A</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="640.5" x2="678.5" y1="191" y2="191"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="640.5" x2="678.5" y1="199" y2="199"/><!--MD5=[a24b7bad5361582c0b28cb4a65fe87ce]
+class C_0000000658--><rect fill="#FEFECE" filter="url(#f1h4e6dmexzfad)" height="73.6094" id="C_0000000658" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="586" y="8"/><ellipse cx="651.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M654.2188,29.6406 Q653.6406,29.9375 653,30.0781 Q652.3594,30.2344 651.6563,30.2344 Q649.1563,30.2344 647.8281,28.5938 Q646.5156,26.9375 646.5156,23.8125 Q646.5156,20.6875 647.8281,19.0313 Q649.1563,17.375 651.6563,17.375 Q652.3594,17.375 653,17.5313 Q653.6563,17.6875 654.2188,17.9844 L654.2188,20.7031 Q653.5938,20.125 653,19.8594 Q652.4063,19.5781 651.7813,19.5781 Q650.4375,19.5781 649.75,20.6563 Q649.0625,21.7188 649.0625,23.8125 Q649.0625,25.9063 649.75,26.9844 Q650.4375,28.0469 651.7813,28.0469 Q652.4063,28.0469 653,27.7813 Q653.5938,27.5 654.2188,26.9219 L654.2188,29.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="671.75" y="28.1543">R</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="587" x2="732" y1="40" y2="40"/><ellipse cx="597" cy="51" 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="106" x="606" y="54.2104">la : lift_void_t&lt;A&gt;*</text><ellipse cx="597" cy="63.8047" 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="121" x="606" y="67.0151">lv : lift_void_t&lt;void&gt;*</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="587" x2="732" y1="73.6094" y2="73.6094"/><!--MD5=[ba7901dc6eee44f8aa721a7301a41e0d]
+link C_0000000646 to C_0000000644--><path d="M339.5,69.07 C339.5,88.12 339.5,115.68 339.5,138.81 " fill="none" id="C_0000000646-&gt;C_0000000644" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="346.5,138.82,339.5,158.82,332.5,138.82,346.5,138.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2d2f09c2fe7104912da304e6c48d2b3a]
+link C_0000000652 to C_0000000650--><path d="M489.5,69.07 C489.5,88.12 489.5,115.68 489.5,138.81 " fill="none" id="C_0000000652-&gt;C_0000000650" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="496.5,138.82,489.5,158.82,482.5,138.82,496.5,138.82" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[307719be9b07333161aa63204d669a95]
+link C_0000000658 to C_0000000656--><path d="M659.5,82.09 C659.5,104.43 659.5,132.72 659.5,153.49 " fill="none" id="C_0000000658-&gt;C_0000000656" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#A80036" points="659.5,158.6,663.5,149.6,659.5,153.6,655.5,149.6,659.5,158.6" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="665.5" cy="121.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="11" x="672.5" y="125.0669">la</text><!--MD5=[81b4daaa7ad34c7585c58632179901f3]
 @startuml
-class "Void" as C_0000000563
-class C_0000000563 {
+
+class "Void" as C_0000000642
+class C_0000000642 {
 +operator==(Void const& ) const : bool
 +operator!=(Void const& ) const : bool
 }
 
-class "lift_void<T>" as C_0000000565
-class C_0000000565 {
+class "lift_void<T>" as C_0000000644
+class C_0000000644 {
 }
 
-class "lift_void<void>" as C_0000000567
-class C_0000000567 {
+class "lift_void<void>" as C_0000000646
+class C_0000000646 {
 }
 
-class "drop_void<T>" as C_0000000571
-class C_0000000571 {
+class "drop_void<T>" as C_0000000650
+class C_0000000650 {
 }
 
-class "drop_void<Void>" as C_0000000573
-class C_0000000573 {
+class "drop_void<Void>" as C_0000000652
+class C_0000000652 {
 }
 
-class "A" as C_0000000577
-class C_0000000577 {
+class "A" as C_0000000656
+class C_0000000656 {
 }
 
-class "R" as C_0000000579
-class C_0000000579 {
+class "R" as C_0000000658
+class C_0000000658 {
 +la : lift_void_t<A>*
 +lv : lift_void_t<void>*
 }
 
-C_0000000567 ..|> C_0000000565
-C_0000000573 ..|> C_0000000571
-C_0000000579 - -> C_0000000577 : +la
+C_0000000646 ..|> C_0000000644
+C_0000000652 ..|> C_0000000650
+C_0000000658 - -> C_0000000656 : +la
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index a61b7500..46f289d8 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,38 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="fd5wfc3odsgfk" 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></defs><g><!--MD5=[087667e362ff88b1f82e4421ccd1938b]
-class C_0000000581--><rect fill="#FEFECE" filter="url(#fd5wfc3odsgfk)" height="48" id="C_0000000581" 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"/><!--MD5=[1547884f639f0d9d83e0d9b37b741bc2]
-class C_0000000583--><rect fill="#FEFECE" filter="url(#fd5wfc3odsgfk)" height="48" id="C_0000000583" 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"/><!--MD5=[53f489b4542b5439c6b4896c42fe40bb]
-class C_0000000585--><rect fill="#FEFECE" filter="url(#fd5wfc3odsgfk)" height="48" id="C_0000000585" 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"/><!--MD5=[7352a21cb42e30e894d63c0220c6a4cf]
-class C_0000000587--><rect fill="#FEFECE" filter="url(#fd5wfc3odsgfk)" height="48" id="C_0000000587" 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"/><!--MD5=[dd6f1362296a4a0a9c640c22c118a850]
-class C_0000000589--><rect fill="#FEFECE" filter="url(#fd5wfc3odsgfk)" height="48" id="C_0000000589" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="206.5" x2="268.5" y1="148" y2="148"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="206.5" x2="268.5" y1="156" y2="156"/><!--MD5=[b0f673a517c77f82b48075e64501f8e4]
-link C_0000000581 to C_0000000585--><!--MD5=[51c9e21066ad7d221054203a4c067228]
-link C_0000000585 to C_0000000587--><!--MD5=[4639c39204d387afd0fcc44e2df57388]
-link C_0000000583 to C_0000000585--><!--MD5=[d4c2e8270f953fd9aba6ee171848bfea]
-link C_0000000585 to C_0000000589--><!--MD5=[010a9280697e7ebd9ac02293e2b3fd66]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1st1ikeu0kv5o" 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></defs><g><!--MD5=[c71bc9c4f8d66beb1bfea13d9d81c28e]
+class C_0000000662--><rect fill="#FEFECE" filter="url(#f1st1ikeu0kv5o)" height="48" id="C_0000000662" 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"/><!--MD5=[30fbba2e5b0957d9e00a71677e56f33c]
+class C_0000000664--><rect fill="#FEFECE" filter="url(#f1st1ikeu0kv5o)" height="48" id="C_0000000664" 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"/><!--MD5=[c2f9386938f49f1462d0473496019e77]
+class C_0000000666--><rect fill="#FEFECE" filter="url(#f1st1ikeu0kv5o)" height="48" id="C_0000000666" 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"/><!--MD5=[9a90c58bf19826bb80d1c83cc62cd1c7]
+class C_0000000668--><rect fill="#FEFECE" filter="url(#f1st1ikeu0kv5o)" height="48" id="C_0000000668" 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"/><!--MD5=[2c24a5b8d9ef56e4713105e938627261]
+class C_0000000670--><rect fill="#FEFECE" filter="url(#f1st1ikeu0kv5o)" height="48" id="C_0000000670" 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><line style="stroke: #A80036; stroke-width: 1.5;" x1="206.5" x2="268.5" y1="148" y2="148"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="206.5" x2="268.5" y1="156" y2="156"/><!--MD5=[e70fa9dfaa07652c353720fe11cb4677]
+link C_0000000662 to C_0000000666--><!--MD5=[d4bb97e5ecebf70ac9bdbbb54633fc6e]
+link C_0000000666 to C_0000000668--><!--MD5=[20eac8c5fbad061ee053286ee6378cea]
+link C_0000000664 to C_0000000666--><!--MD5=[970c98b9eb6fe9e893255f7baef8a880]
+link C_0000000666 to C_0000000670--><!--MD5=[030631a0f44235460b415a58da034aed]
 @startuml
-class "Top" as C_0000000581
-class C_0000000581 {
+
+class "Top" as C_0000000662
+class C_0000000662 {
 }
 
-class "Left" as C_0000000583
-class C_0000000583 {
+class "Left" as C_0000000664
+class C_0000000664 {
 }
 
-class "Center" as C_0000000585
-class C_0000000585 {
+class "Center" as C_0000000666
+class C_0000000666 {
 }
 
-class "Bottom" as C_0000000587
-class C_0000000587 {
+class "Bottom" as C_0000000668
+class C_0000000668 {
 }
 
-class "Right" as C_0000000589
-class C_0000000589 {
+class "Right" as C_0000000670
+class C_0000000670 {
 }
 
-C_0000000585 -[hidden]up- C_0000000581
-C_0000000585 -[hidden]down- C_0000000587
-C_0000000585 -[hidden]left- C_0000000583
-C_0000000585 -[hidden]right- C_0000000589
+C_0000000666 -[hidden]up- C_0000000662
+C_0000000666 -[hidden]down- C_0000000668
+C_0000000666 -[hidden]left- C_0000000664
+C_0000000666 -[hidden]right- C_0000000670
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index cab52ab5..e628e932 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,50 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:476px;height:527px;" version="1.1" viewBox="0 0 476 527" width="476px" zoomAndPan="magnify"><defs><filter height="300%" id="f11vhiv8zc8f18" 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></defs><g><!--MD5=[1f29f96fc3b54451188ae086de76d7dc]
-cluster C_0000000591--><polygon fill="#FFFFFF" filter="url(#f11vhiv8zc8f18)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,515,22,515,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text><!--MD5=[fdc10df66e58bf41a7d905dfada9b478]
-cluster C_0000000594--><polygon fill="#FFFFFF" filter="url(#f11vhiv8zc8f18)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,491,102,491,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text><!--MD5=[909ed8b53cb7dfdfb108f68911c9c23d]
-cluster C_0000000597--><polygon fill="#FFFFFF" filter="url(#f11vhiv8zc8f18)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,367,126,367,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text><!--MD5=[4497b261902617694e3301f1cb2eaa35]
-cluster C_0000000602--><polygon fill="#FFFFFF" filter="url(#f11vhiv8zc8f18)" 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><!--MD5=[76698cb51cfb6f38a48571c5e44df958]
-cluster C_0000000603--><polygon fill="#FFFFFF" filter="url(#f11vhiv8zc8f18)" 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><!--MD5=[20f1404279a0745ea37e2f02bc9e3cc0]
-class C_0000000592--><rect fill="#FEFECE" filter="url(#f11vhiv8zc8f18)" height="73.6094" id="C_0000000592" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/><ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="171" y2="171"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="44.5" y="185.2104">blue</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/><!--MD5=[033317764ce7ccb16d1b2d74ceb1e7e9]
-class C_0000000595--><rect fill="#FEFECE" filter="url(#f11vhiv8zc8f18)" height="60.8047" id="C_0000000595" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="414"/><ellipse cx="183.45" cy="430" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M186.4188,435.6406 Q185.8406,435.9375 185.2,436.0781 Q184.5594,436.2344 183.8563,436.2344 Q181.3563,436.2344 180.0281,434.5938 Q178.7156,432.9375 178.7156,429.8125 Q178.7156,426.6875 180.0281,425.0313 Q181.3563,423.375 183.8563,423.375 Q184.5594,423.375 185.2,423.5313 Q185.8563,423.6875 186.4188,423.9844 L186.4188,426.7031 Q185.7938,426.125 185.2,425.8594 Q184.6063,425.5781 183.9813,425.5781 Q182.6375,425.5781 181.95,426.6563 Q181.2625,427.7188 181.2625,429.8125 Q181.2625,431.9063 181.95,432.9844 Q182.6375,434.0469 183.9813,434.0469 Q184.6063,434.0469 185.2,433.7813 Q185.7938,433.5 186.4188,432.9219 L186.4188,435.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="434.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="214" y="411"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="423.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="446" y2="446"/><ellipse cx="179" cy="457" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="460.2104">a : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="466.8047" y2="466.8047"/><!--MD5=[eb57112ba9ebe22ba3b46ee3402c252d]
-class C_0000000599--><rect fill="#FEFECE" filter="url(#f11vhiv8zc8f18)" height="48" id="C_0000000599" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/><ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="209" y="300"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="210" y="312.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/><!--MD5=[82cc10afdbffaafac0fb42c81d7cea9b]
-class C_0000000598--><rect fill="#FEFECE" filter="url(#f11vhiv8zc8f18)" height="60.8047" id="C_0000000598" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/><ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/><ellipse cx="153" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="191.7104">a_int : A&lt;int&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="198.3047" y2="198.3047"/><!--MD5=[add189f9c011e846a3823662927cd650]
-class C_0000000604--><rect fill="#FEFECE" filter="url(#f11vhiv8zc8f18)" height="48" id="C_0000000604" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/><ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="413" y1="184" y2="184"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="413" y1="192" y2="192"/><!--MD5=[c534630ff692a0d5bd9cc8ee95fc5796]
-link C_0000000599 to C_0000000595--><path d="M194,351.1 C194,363.36 194,378.92 194,393.77 " fill="none" id="C_0000000599-&gt;C_0000000595" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="201,393.86,194,413.86,187,393.86,201,393.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[6b7b55542998987aa2e80b85b8e9dd98]
-reverse link C_0000000598 to C_0000000599--><path d="M194,220.15 C194,247.03 194,280.58 194,302.61 " fill="none" id="C_0000000598&lt;-C_0000000599" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="194,206.79,190,212.79,194,218.79,198,212.79,194,206.79" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="200" cy="265.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="207" y="269.0669">a_int</text><!--MD5=[0d9368f9108f4aa55a8698b350cd9cbb]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:569px;height:527px;" version="1.1" viewBox="0 0 569 527" width="569px" zoomAndPan="magnify"><defs><filter height="300%" id="f1h9fgwvxifeyz" 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></defs><g><!--MD5=[c30781010a42f12a7d563c980afcf8dc]
+cluster C_0000000674--><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="115,24.5,150,24.5,157,46.7969,403,46.7969,403,515,115,515,115,24.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="115" x2="157" y1="46.7969" y2="46.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="119" y="39.4951">ns1</text><!--MD5=[cc531c1893061a8a235132e4c4964076]
+cluster C_0000000677--><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="195,67.5,240,67.5,247,89.7969,379,89.7969,379,491,195,491,195,67.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="195" x2="247" y1="89.7969" y2="89.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="199" y="82.4951">ns11</text><!--MD5=[6b02754a8227ea69de779b367ad221d0]
+cluster C_0000000680--><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="219,110.5,274,110.5,281,132.7969,355,132.7969,355,367,219,367,219,110.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="219" x2="281" y1="132.7969" y2="132.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="223" y="125.4951">ns111</text><!--MD5=[f1a8d5f9172809128f35966513298d9a]
+cluster C_0000000685--><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="427,74,462,74,469,96.2969,547,96.2969,547,240,427,240,427,74" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="427" x2="469" y1="96.2969" y2="96.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="431" y="88.9951">ns2</text><!--MD5=[d6bc0f244594de74214d284f324fb151]
+cluster C_0000000686--><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="451,117,496,117,503,139.2969,523,139.2969,523,216,451,216,451,117" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="451" x2="503" y1="139.2969" y2="139.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="455" y="131.9951">ns22</text><polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="6,149.5,82,149.5,89,171.7969,96,171.7969,96,202.0938,6,202.0938,6,149.5" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="89" y1="171.7969" y2="171.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="70" x="10" y="164.4951">clanguml</text><!--MD5=[14d09830d9b1ae9a58e9670757aa41ab]
+class C_0000000675--><rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="73.6094" id="C_0000000675" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="131.5" y="139"/><ellipse cx="149.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M153.7594,161 L146.0406,161 L146.0406,148.6094 L153.7594,148.6094 L153.7594,150.7656 L148.4938,150.7656 L148.4938,153.4375 L153.2594,153.4375 L153.2594,155.5938 L148.4938,155.5938 L148.4938,158.8438 L153.7594,158.8438 L153.7594,161 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="164.35" y="159.1543">E</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="177.5" y1="171" y2="171"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="137.5" y="185.2104">blue</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="137.5" y="198.0151">yellow</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="177.5" y1="204.6094" y2="204.6094"/><!--MD5=[06f8d2e41f88ceddee61b0e110547e06]
+class C_0000000678--><rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="60.8047" id="C_0000000678" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="261" y="414"/><ellipse cx="276.45" cy="430" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M279.4188,435.6406 Q278.8406,435.9375 278.2,436.0781 Q277.5594,436.2344 276.8563,436.2344 Q274.3563,436.2344 273.0281,434.5938 Q271.7156,432.9375 271.7156,429.8125 Q271.7156,426.6875 273.0281,425.0313 Q274.3563,423.375 276.8563,423.375 Q277.5594,423.375 278.2,423.5313 Q278.8563,423.6875 279.4188,423.9844 L279.4188,426.7031 Q278.7938,426.125 278.2,425.8594 Q277.6063,425.5781 276.9813,425.5781 Q275.6375,425.5781 274.95,426.6563 Q274.2625,427.7188 274.2625,429.8125 Q274.2625,431.9063 274.95,432.9844 Q275.6375,434.0469 276.9813,434.0469 Q277.6063,434.0469 278.2,433.7813 Q278.7938,433.5 279.4188,432.9219 L279.4188,435.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="290.55" y="434.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="307" y="411"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="308" y="423.1387">T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="312" y1="446" y2="446"/><ellipse cx="272" cy="457" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="281" y="460.2104">a : T</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="312" y1="466.8047" y2="466.8047"/><!--MD5=[38dfdeab987e2937cc3318bcc3cd496b]
+class C_0000000682--><rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="48" id="C_0000000682" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="257" y="303"/><ellipse cx="272" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M274.9688,324.6406 Q274.3906,324.9375 273.75,325.0781 Q273.1094,325.2344 272.4063,325.2344 Q269.9063,325.2344 268.5781,323.5938 Q267.2656,321.9375 267.2656,318.8125 Q267.2656,315.6875 268.5781,314.0313 Q269.9063,312.375 272.4063,312.375 Q273.1094,312.375 273.75,312.5313 Q274.4063,312.6875 274.9688,312.9844 L274.9688,315.7031 Q274.3438,315.125 273.75,314.8594 Q273.1563,314.5781 272.5313,314.5781 Q271.1875,314.5781 270.5,315.6563 Q269.8125,316.7188 269.8125,318.8125 Q269.8125,320.9063 270.5,321.9844 Q271.1875,323.0469 272.5313,323.0469 Q273.1563,323.0469 273.75,322.7813 Q274.3438,322.5 274.9688,321.9219 L274.9688,324.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="286" y="323.1543">A</text><rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="302" y="300"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="303" y="312.1387">int</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="316" y1="335" y2="335"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="316" y1="343" y2="343"/><!--MD5=[0002f56bbb429f96883ab40223413987]
+class C_0000000681--><rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="60.8047" id="C_0000000681" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="235" y="145.5"/><ellipse cx="278.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M281.7688,167.1406 Q281.1906,167.4375 280.55,167.5781 Q279.9094,167.7344 279.2063,167.7344 Q276.7063,167.7344 275.3781,166.0938 Q274.0656,164.4375 274.0656,161.3125 Q274.0656,158.1875 275.3781,156.5313 Q276.7063,154.875 279.2063,154.875 Q279.9094,154.875 280.55,155.0313 Q281.2063,155.1875 281.7688,155.4844 L281.7688,158.2031 Q281.1438,157.625 280.55,157.3594 Q279.9563,157.0781 279.3313,157.0781 Q277.9875,157.0781 277.3,158.1563 Q276.6125,159.2188 276.6125,161.3125 Q276.6125,163.4063 277.3,164.4844 Q277.9875,165.5469 279.3313,165.5469 Q279.9563,165.5469 280.55,165.2813 Q281.1438,165 281.7688,164.4219 L281.7688,167.1406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.2" y="165.6543">B</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="338" y1="177.5" y2="177.5"/><ellipse cx="246" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="255" y="191.7104">a_int : A&lt;int&gt;</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="338" y1="198.3047" y2="198.3047"/><!--MD5=[004f694773038beeca86050864312601]
+class C_0000000687--><rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="48" id="C_0000000687" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="467" y="152"/><ellipse cx="482" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M484.9688,173.6406 Q484.3906,173.9375 483.75,174.0781 Q483.1094,174.2344 482.4063,174.2344 Q479.9063,174.2344 478.5781,172.5938 Q477.2656,170.9375 477.2656,167.8125 Q477.2656,164.6875 478.5781,163.0313 Q479.9063,161.375 482.4063,161.375 Q483.1094,161.375 483.75,161.5313 Q484.4063,161.6875 484.9688,161.9844 L484.9688,164.7031 Q484.3438,164.125 483.75,163.8594 Q483.1563,163.5781 482.5313,163.5781 Q481.1875,163.5781 480.5,164.6563 Q479.8125,165.7188 479.8125,167.8125 Q479.8125,169.9063 480.5,170.9844 Q481.1875,172.0469 482.5313,172.0469 Q483.1563,172.0469 483.75,171.7813 Q484.3438,171.5 484.9688,170.9219 L484.9688,173.6406 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="172.1543">C</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="506" y1="184" y2="184"/><line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="506" y1="192" y2="192"/><!--MD5=[ece9d1c5156164a338868f9dcb90fd09]
+link C_0000000682 to C_0000000678--><path d="M287,351.1 C287,363.36 287,378.92 287,393.77 " fill="none" id="C_0000000682-&gt;C_0000000678" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="none" points="294,393.86,287,413.86,280,393.86,294,393.86" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[766060a905d2b3b4b3dabefd8027be37]
+reverse link C_0000000681 to C_0000000682--><path d="M287,220.15 C287,247.03 287,280.58 287,302.61 " fill="none" id="C_0000000681&lt;-C_0000000682" style="stroke: #A80036; stroke-width: 1.0;"/><polygon fill="#FFFFFF" points="287,206.79,283,212.79,287,218.79,291,212.79,287,206.79" style="stroke: #A80036; stroke-width: 1.0;"/><ellipse cx="293" cy="265.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="300" y="269.0669">a_int</text><!--MD5=[494b624b5cfef59cab554826442e6e6d]
 @startuml
-package [ns1] as C_0000000591 {
-enum "E" as C_0000000592
-enum C_0000000592 {
+package [clanguml] as C_0000000672 {
+}
+
+package [ns1] as C_0000000674 {
+enum "E" as C_0000000675
+enum C_0000000675 {
 blue
 yellow
 }
-package [ns11] as C_0000000594 {
-class "A<T>" as C_0000000595
-class C_0000000595 {
+package [ns11] as C_0000000677 {
+class "A<T>" as C_0000000678
+class C_0000000678 {
 +a : T
 }
-package [ns111] as C_0000000597 {
-class "A<int>" as C_0000000599
-class C_0000000599 {
+package [ns111] as C_0000000680 {
+class "A<int>" as C_0000000682
+class C_0000000682 {
 }
-class "B" as C_0000000598
-class C_0000000598 {
+class "B" as C_0000000681
+class C_0000000681 {
 +a_int : A<int>
 }
 }
 }
 }
 
-package [ns2] as C_0000000602 {
-package [ns22] as C_0000000603 {
-class "C" as C_0000000604
-class C_0000000604 {
+package [ns2] as C_0000000685 {
+package [ns22] as C_0000000686 {
+class "C" as C_0000000687
+class C_0000000687 {
 }
 }
 }
 
-C_0000000599 ..|> C_0000000595
-C_0000000598 o- - C_0000000599 : +a_int
+C_0000000682 ..|> C_0000000678
+C_0000000681 o- - C_0000000682 : +a_int
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 0c8ff2b3..0b9ac111 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:725px;height:207px;" version="1.1" viewBox="0 0 725 207" width="725px" zoomAndPan="magnify"><defs><filter height="300%" id="f1s5f9wh4uzvmo" 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></defs><g><!--MD5=[b716c4b9a56803841ea740e170210ad7]
-cluster C_0000000606--><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="22,24,39,24,46,46.2969,292,46.2969,292,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text><!--MD5=[406861724135dc95d0ca4ef64f8ea75b]
-cluster C_0000000607--><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="97,67,125,67,132,89.2969,268,89.2969,268,171,97,171,97,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="97" x2="132" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="101" y="81.9951">AA</text><!--MD5=[706b952ee30acd0323c742cbdc372119]
-cluster C_0000000611--><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="433,24,449,24,456,46.2969,703,46.2969,703,195,433,195,433,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="433" x2="456" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="437" y="38.9951">B</text><!--MD5=[c474af66b65639ee9c9cb31ef0ea0601]
-cluster C_0000000612--><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="508,67,536,67,543,89.2969,679,89.2969,679,171,508,171,508,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="508" x2="543" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="512" y="81.9951">AA</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="198.5,102,237.5,102,244.5,124.2969,251.5,124.2969,251.5,154.5938,198.5,154.5938,198.5,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="198.5" x2="244.5" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="202.5" y="116.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="113,102,149,102,156,124.2969,163,124.2969,163,154.5938,113,154.5938,113,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="113" x2="156" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="117" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="38,102,64,102,71,124.2969,78,124.2969,78,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="71" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="42" y="116.9951">BB</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="609.5,102,648.5,102,655.5,124.2969,662.5,124.2969,662.5,154.5938,609.5,154.5938,609.5,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="609.5" x2="655.5" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="613.5" y="116.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="524,102,560,102,567,124.2969,574,124.2969,574,154.5938,524,154.5938,524,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="524" x2="567" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="528" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f1s5f9wh4uzvmo)" points="449,102,475,102,482,124.2969,489,124.2969,489,154.5938,449,154.5938,449,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="449" x2="482" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="453" y="116.9951">BB</text><path d="M308,116 L308,141.1328 L414,141.1328 L414,126 L404,116 L308,116 " fill="#FBFB77" filter="url(#f1s5f9wh4uzvmo)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M404,116 L404,126 L414,126 L404,116 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="314" y="133.0669">A AAA note...</text><!--MD5=[d0de0e1e127e25c4b0d66ee274c0d2c3]
-link C_0000000608 to GMN540--><path d="M251.56,128.5 C270.37,128.5 289.18,128.5 307.99,128.5 " fill="none" id="C_0000000608-GMN540" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[19c27a88bc6bcc8fb1f340703f8f9970]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:725px;height:207px;" version="1.1" viewBox="0 0 725 207" width="725px" zoomAndPan="magnify"><defs><filter height="300%" id="fk8ewrf6dpt0b" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[ee4c366214234d400cc99be39336ee33]
+cluster C_0000000689--><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="22,24,39,24,46,46.2969,292,46.2969,292,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[033a75f234d5b892af6549da401e3487]
+cluster C_0000000690--><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="97,67,125,67,132,89.2969,268,89.2969,268,171,97,171,97,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="97" x2="132" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="101" y="81.9951">AA</text><!--MD5=[cb9d8895dfd2bfbec48efc4e8c4954d5]
+cluster C_0000000694--><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="433,24,449,24,456,46.2969,703,46.2969,703,195,433,195,433,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="433" x2="456" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="437" y="38.9951">B</text><!--MD5=[284dd6264d5a7104e1054d8e8f957185]
+cluster C_0000000695--><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="508,67,536,67,543,89.2969,679,89.2969,679,171,508,171,508,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="508" x2="543" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="512" y="81.9951">AA</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="198.5,102,237.5,102,244.5,124.2969,251.5,124.2969,251.5,154.5938,198.5,154.5938,198.5,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="198.5" x2="244.5" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="202.5" y="116.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="113,102,149,102,156,124.2969,163,124.2969,163,154.5938,113,154.5938,113,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="113" x2="156" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="117" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="38,102,64,102,71,124.2969,78,124.2969,78,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="71" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="42" y="116.9951">BB</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="609.5,102,648.5,102,655.5,124.2969,662.5,124.2969,662.5,154.5938,609.5,154.5938,609.5,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="609.5" x2="655.5" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="613.5" y="116.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="524,102,560,102,567,124.2969,574,124.2969,574,154.5938,524,154.5938,524,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="524" x2="567" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="528" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="449,102,475,102,482,124.2969,489,124.2969,489,154.5938,449,154.5938,449,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="449" x2="482" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="453" y="116.9951">BB</text><path d="M308,116 L308,141.1328 L414,141.1328 L414,126 L404,116 L308,116 " fill="#FBFB77" filter="url(#fk8ewrf6dpt0b)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M404,116 L404,126 L414,126 L404,116 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="314" y="133.0669">A AAA note...</text><!--MD5=[f2bc31f5fae96d697c4063753ee9bf9c]
+link C_0000000691 to GMN542--><path d="M251.56,128.5 C270.37,128.5 289.18,128.5 307.99,128.5 " fill="none" id="C_0000000691-GMN542" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[579e8061ceca84bbb5fb9f940568428d]
 @startuml
-package [A] as C_0000000606 {
-package [AA] as C_0000000607 {
-package [AAA] as C_0000000608 {
+package [A] as C_0000000689 {
+package [AA] as C_0000000690 {
+package [AAA] as C_0000000691 {
 }
-package [BBB] as C_0000000609 {
+package [BBB] as C_0000000692 {
 }
 }
-package [BB] as C_0000000610 {
+package [BB] as C_0000000693 {
 }
 }
 
-package [B] as C_0000000611 {
-package [AA] as C_0000000612 {
-package [AAA] as C_0000000613 {
+package [B] as C_0000000694 {
+package [AA] as C_0000000695 {
+package [AAA] as C_0000000696 {
 }
-package [BBB] as C_0000000614 {
+package [BBB] as C_0000000697 {
 }
 }
-package [BB] as C_0000000615 {
+package [BB] as C_0000000698 {
 }
 }
 
 
 
-note right of C_0000000608: A AAA note...
+note right of C_0000000691: A AAA note...
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 0d93ba2b..5bacd6c5 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1118px;height:402px;" version="1.1" viewBox="0 0 1118 402" width="1118px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xkr3279hotfs" 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></defs><g><!--MD5=[05a5eeb39b4bcdc762ac22369ddccd7f]
-cluster C_0000000616--><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="22,219,39,219,46,241.2969,1096,241.2969,1096,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text><!--MD5=[2d303fc2ac5eb61640fa07ff3dbd5c33]
-cluster C_0000000617--><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="46,262,74,262,81,284.2969,1072,284.2969,1072,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text><!--MD5=[2c37467eb907008ccead4f0868e48986]
-cluster C_0000000631--><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="514,24,530,24,537,46.2969,644,46.2969,644,195,514,195,514,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="514" x2="537" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="518" y="38.9951">B</text><!--MD5=[a1140dd7dfe3086078cac78f0120d85e]
-cluster C_0000000632--><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="538,67,564,67,571,89.2969,620,89.2969,620,171,538,171,538,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="538" x2="571" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="542" y="81.9951">BB</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="1014.5,297,1041.5,297,1048.5,319.2969,1055.5,319.2969,1055.5,349.5938,1014.5,349.5938,1014.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="1014.5" x2="1048.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1018.5" y="311.9951">A1</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="938.5,297,965.5,297,972.5,319.2969,979.5,319.2969,979.5,349.5938,938.5,349.5938,938.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="938.5" x2="972.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="942.5" y="311.9951">A2</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="862.5,297,889.5,297,896.5,319.2969,903.5,319.2969,903.5,349.5938,862.5,349.5938,862.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="862.5" x2="896.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="866.5" y="311.9951">A3</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="786.5,297,813.5,297,820.5,319.2969,827.5,319.2969,827.5,349.5938,786.5,349.5938,786.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="786.5" x2="820.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="790.5" y="311.9951">A4</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="710.5,297,737.5,297,744.5,319.2969,751.5,319.2969,751.5,349.5938,710.5,349.5938,710.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="710.5" x2="744.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="714.5" y="311.9951">A5</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="634.5,297,661.5,297,668.5,319.2969,675.5,319.2969,675.5,349.5938,634.5,349.5938,634.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="634.5" x2="668.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="638.5" y="311.9951">A6</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="558.5,297,585.5,297,592.5,319.2969,599.5,319.2969,599.5,349.5938,558.5,349.5938,558.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="558.5" x2="592.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="562.5" y="311.9951">A7</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="482.5,297,509.5,297,516.5,319.2969,523.5,319.2969,523.5,349.5938,482.5,349.5938,482.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="482.5" x2="516.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="486.5" y="311.9951">A8</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="406.5,297,433.5,297,440.5,319.2969,447.5,319.2969,447.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="440.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="410.5" y="311.9951">A9</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A10</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A11</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A12</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A13</text><polygon fill="#FFFFFF" filter="url(#f1xkr3279hotfs)" points="554,102,590,102,597,124.2969,604,124.2969,604,154.5938,554,154.5938,554,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="554" x2="597" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="558" y="116.9951">BBB</text><!--MD5=[cbb6df2ff0b2823142916e4cedfc86df]
-link C_0000000633 to C_0000000618--><path d="M604.25,131.16 C685.35,136.98 937.39,158.99 997,211 C1020.16,231.21 1029.23,266.13 1032.76,291.51 " fill="none" id="C_0000000633-&gt;C_0000000618" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1033.43,296.78,1036.2428,287.3413,1032.7888,291.8213,1028.3088,288.3673,1033.43,296.78" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[bb67d00e6c9c0f9b512f0af596166103]
-link C_0000000633 to C_0000000619--><path d="M604.07,132.33 C674.78,140.79 873.7,167.98 921,211 C943.74,231.68 952.88,266.52 956.54,291.75 " fill="none" id="C_0000000633-&gt;C_0000000619" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="957.25,296.99,960.0326,287.5424,956.5929,292.0334,952.102,288.5937,957.25,296.99" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[07166e67a6998074eaa8ebdf0b105f73]
-link C_0000000633 to C_0000000620--><path d="M604.38,129.96 C656.6,132.28 776.85,144.94 845,211 C866.93,232.26 876.21,266.67 880.13,291.65 " fill="none" id="C_0000000633-&gt;C_0000000620" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="880.89,296.83,883.5655,287.3515,880.1769,291.8811,875.6473,288.4925,880.89,296.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4a0a480f00b71274875534e3d22e76d1]
-link C_0000000633 to C_0000000621--><path d="M604.33,133.59 C644.75,141.41 723.88,162.28 769,211 C789.63,233.27 799.11,267.21 803.44,291.79 " fill="none" id="C_0000000633-&gt;C_0000000621" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="804.28,296.88,806.7325,287.3414,803.4511,291.9492,798.8433,288.6677,804.28,296.88" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[579e132fc5f067af34614184c13648c1]
-link C_0000000633 to C_0000000622--><path d="M604.31,141.6 C630.08,155.14 669.48,179.37 693,211 C710.88,235.06 720.75,268.12 725.91,291.99 " fill="none" id="C_0000000633-&gt;C_0000000622" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="726.94,296.93,729.0001,287.299,725.9099,292.0373,721.1717,288.9471,726.94,296.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[49553cf7ae1956dd6944ab9222d07206]
-link C_0000000633 to C_0000000624--><path d="M579,155.13 C579,190.31 579,253.51 579,291.37 " fill="none" id="C_0000000633-&gt;C_0000000624" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="579,296.77,583,287.77,579,291.77,575,287.77,579,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5b2a791b03a880c709d1f5f64785e2f1]
-link C_0000000633 to C_0000000625--><path d="M566.13,155.25 C558.4,171.13 548.63,192.03 541,211 C530.15,237.99 519.62,269.41 512.41,292 " fill="none" id="C_0000000633-&gt;C_0000000625" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="510.83,296.97,517.3651,289.6016,512.3425,292.2042,509.7399,287.1817,510.83,296.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c1dd44a0e4a31d0850b0509c1fe4c120]
-link C_0000000633 to C_0000000626--><path d="M553.69,141.6 C527.92,155.14 488.52,179.37 465,211 C447.12,235.06 437.25,268.12 432.09,291.99 " fill="none" id="C_0000000633-&gt;C_0000000626" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="431.06,296.93,436.8283,288.9471,432.0901,292.0373,428.9999,287.299,431.06,296.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[69f6089aba3d00fe44e94664cc1b8112]
-link C_0000000633 to C_0000000623--><path d="M591.87,155.25 C599.6,171.13 609.37,192.03 617,211 C627.85,237.99 638.38,269.41 645.59,292 " fill="none" id="C_0000000633-&gt;C_0000000623" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="647.17,296.97,648.2601,287.1817,645.6575,292.2042,640.6349,289.6016,647.17,296.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7c0cb9c3e5f22bd7e353ba86bd3566f3]
-link C_0000000633 to C_0000000627--><path d="M553.89,133.8 C513.78,141.91 435.07,163.18 389,211 C367.63,233.18 356.59,267.13 351.08,291.74 " fill="none" id="C_0000000633-&gt;C_0000000627" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="349.98,296.84,355.7929,288.8895,351.0374,291.9531,347.9738,287.1976,349.98,296.84" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4a4763d6a2b81e17b7717c0d54f378d5]
-link C_0000000633 to C_0000000628--><path d="M553.71,129.84 C500.42,131.92 375.54,144.11 303,211 C280.22,232.01 269.38,266.46 264.31,291.52 " fill="none" id="C_0000000633-&gt;C_0000000628" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="263.31,296.71,268.9342,288.6249,264.2521,291.7996,261.0775,287.1175,263.31,296.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b03b985e98a950e3dcad561485379ea2]
-link C_0000000633 to C_0000000629--><path d="M553.88,132.08 C480.5,140.08 268.39,166.64 217,211 C193.29,231.46 182.59,266.56 177.8,291.91 " fill="none" id="C_0000000633-&gt;C_0000000629" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="176.92,296.85,182.4259,288.6839,177.7906,291.9264,174.5481,287.291,176.92,296.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[a95757879a786dba6fc368812107b609]
-link C_0000000633 to C_0000000630--><path d="M553.84,130.9 C469.23,136.06 196.62,156.69 131,211 C106.87,230.97 96.25,266.15 91.59,291.66 " fill="none" id="C_0000000633-&gt;C_0000000630" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="90.74,296.63,96.1999,288.4331,91.5828,291.7015,88.3143,287.0845,90.74,296.63" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[4484d15fed7e12d58d19dc2e93a2dc37]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1118px;height:402px;" version="1.1" viewBox="0 0 1118 402" width="1118px" zoomAndPan="magnify"><defs><filter height="300%" id="fz24bx4tbiahm" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[f990774d6fe96cc8dc175947ae91ae33]
+cluster C_0000000699--><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="22,219,39,219,46,241.2969,1096,241.2969,1096,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[186b2a5e777a7319184e0732b76f0668]
+cluster C_0000000700--><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="46,262,74,262,81,284.2969,1072,284.2969,1072,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[af6c815f4cae8139ea45b52b6c01fe72]
+cluster C_0000000714--><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="514,24,530,24,537,46.2969,644,46.2969,644,195,514,195,514,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="514" x2="537" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="518" y="38.9951">B</text><!--MD5=[d02fa7b97dbe8f4cb19451c7d07c32c8]
+cluster C_0000000715--><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="538,67,564,67,571,89.2969,620,89.2969,620,171,538,171,538,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="538" x2="571" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="542" y="81.9951">BB</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="1014.5,297,1041.5,297,1048.5,319.2969,1055.5,319.2969,1055.5,349.5938,1014.5,349.5938,1014.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="1014.5" x2="1048.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1018.5" y="311.9951">A1</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="938.5,297,965.5,297,972.5,319.2969,979.5,319.2969,979.5,349.5938,938.5,349.5938,938.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="938.5" x2="972.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="942.5" y="311.9951">A2</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="862.5,297,889.5,297,896.5,319.2969,903.5,319.2969,903.5,349.5938,862.5,349.5938,862.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="862.5" x2="896.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="866.5" y="311.9951">A3</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="786.5,297,813.5,297,820.5,319.2969,827.5,319.2969,827.5,349.5938,786.5,349.5938,786.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="786.5" x2="820.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="790.5" y="311.9951">A4</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="710.5,297,737.5,297,744.5,319.2969,751.5,319.2969,751.5,349.5938,710.5,349.5938,710.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="710.5" x2="744.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="714.5" y="311.9951">A5</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="634.5,297,661.5,297,668.5,319.2969,675.5,319.2969,675.5,349.5938,634.5,349.5938,634.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="634.5" x2="668.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="638.5" y="311.9951">A6</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="558.5,297,585.5,297,592.5,319.2969,599.5,319.2969,599.5,349.5938,558.5,349.5938,558.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="558.5" x2="592.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="562.5" y="311.9951">A7</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="482.5,297,509.5,297,516.5,319.2969,523.5,319.2969,523.5,349.5938,482.5,349.5938,482.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="482.5" x2="516.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="486.5" y="311.9951">A8</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="406.5,297,433.5,297,440.5,319.2969,447.5,319.2969,447.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="440.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="410.5" y="311.9951">A9</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A10</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A11</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A12</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A13</text><polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="554,102,590,102,597,124.2969,604,124.2969,604,154.5938,554,154.5938,554,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="554" x2="597" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="558" y="116.9951">BBB</text><!--MD5=[4cbe2409c51081e34e7d37a1be947d2c]
+link C_0000000716 to C_0000000701--><path d="M604.25,131.16 C685.35,136.98 937.39,158.99 997,211 C1020.16,231.21 1029.23,266.13 1032.76,291.51 " fill="none" id="C_0000000716-&gt;C_0000000701" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="1033.43,296.78,1036.2428,287.3413,1032.7888,291.8213,1028.3088,288.3673,1033.43,296.78" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2b29574d5acb56224d028a010beb5254]
+link C_0000000716 to C_0000000702--><path d="M604.07,132.33 C674.78,140.79 873.7,167.98 921,211 C943.74,231.68 952.88,266.52 956.54,291.75 " fill="none" id="C_0000000716-&gt;C_0000000702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="957.25,296.99,960.0326,287.5424,956.5929,292.0334,952.102,288.5937,957.25,296.99" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[30e1d0e6935232d5c6492719f10f4a90]
+link C_0000000716 to C_0000000703--><path d="M604.38,129.96 C656.6,132.28 776.85,144.94 845,211 C866.93,232.26 876.21,266.67 880.13,291.65 " fill="none" id="C_0000000716-&gt;C_0000000703" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="880.89,296.83,883.5655,287.3515,880.1769,291.8811,875.6473,288.4925,880.89,296.83" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2c421e778fb99cf4a2cce53bb6705259]
+link C_0000000716 to C_0000000704--><path d="M604.33,133.59 C644.75,141.41 723.88,162.28 769,211 C789.63,233.27 799.11,267.21 803.44,291.79 " fill="none" id="C_0000000716-&gt;C_0000000704" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="804.28,296.88,806.7325,287.3414,803.4511,291.9492,798.8433,288.6677,804.28,296.88" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[021e79bd758de5781d83987a81948858]
+link C_0000000716 to C_0000000705--><path d="M604.31,141.6 C630.08,155.14 669.48,179.37 693,211 C710.88,235.06 720.75,268.12 725.91,291.99 " fill="none" id="C_0000000716-&gt;C_0000000705" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="726.94,296.93,729.0001,287.299,725.9099,292.0373,721.1717,288.9471,726.94,296.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[f27c6f75280a3d9ef4fb641057ec80cf]
+link C_0000000716 to C_0000000707--><path d="M579,155.13 C579,190.31 579,253.51 579,291.37 " fill="none" id="C_0000000716-&gt;C_0000000707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="579,296.77,583,287.77,579,291.77,575,287.77,579,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c9434cdc1f2e91bec1f0b3f778b5a555]
+link C_0000000716 to C_0000000708--><path d="M566.13,155.25 C558.4,171.13 548.63,192.03 541,211 C530.15,237.99 519.62,269.41 512.41,292 " fill="none" id="C_0000000716-&gt;C_0000000708" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="510.83,296.97,517.3651,289.6016,512.3425,292.2042,509.7399,287.1817,510.83,296.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[8a49856d9d7bace95923db18c8632125]
+link C_0000000716 to C_0000000709--><path d="M553.69,141.6 C527.92,155.14 488.52,179.37 465,211 C447.12,235.06 437.25,268.12 432.09,291.99 " fill="none" id="C_0000000716-&gt;C_0000000709" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="431.06,296.93,436.8283,288.9471,432.0901,292.0373,428.9999,287.299,431.06,296.93" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5042e3012fa860c0bf9882c5f6387d8b]
+link C_0000000716 to C_0000000706--><path d="M591.87,155.25 C599.6,171.13 609.37,192.03 617,211 C627.85,237.99 638.38,269.41 645.59,292 " fill="none" id="C_0000000716-&gt;C_0000000706" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="647.17,296.97,648.2601,287.1817,645.6575,292.2042,640.6349,289.6016,647.17,296.97" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[d3cd98cbb146d5ea90b9d9c823d0a7db]
+link C_0000000716 to C_0000000710--><path d="M553.89,133.8 C513.78,141.91 435.07,163.18 389,211 C367.63,233.18 356.59,267.13 351.08,291.74 " fill="none" id="C_0000000716-&gt;C_0000000710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="349.98,296.84,355.7929,288.8895,351.0374,291.9531,347.9738,287.1976,349.98,296.84" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[26c1f0ea184d3d2b2ccbcc29e2d89756]
+link C_0000000716 to C_0000000711--><path d="M553.71,129.84 C500.42,131.92 375.54,144.11 303,211 C280.22,232.01 269.38,266.46 264.31,291.52 " fill="none" id="C_0000000716-&gt;C_0000000711" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="263.31,296.71,268.9342,288.6249,264.2521,291.7996,261.0775,287.1175,263.31,296.71" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[de2d9b353dc1274a3e4b6fbc658ad1ac]
+link C_0000000716 to C_0000000712--><path d="M553.88,132.08 C480.5,140.08 268.39,166.64 217,211 C193.29,231.46 182.59,266.56 177.8,291.91 " fill="none" id="C_0000000716-&gt;C_0000000712" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="176.92,296.85,182.4259,288.6839,177.7906,291.9264,174.5481,287.291,176.92,296.85" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[dd80a3d55b394b8504b69ef4542954d0]
+link C_0000000716 to C_0000000713--><path d="M553.84,130.9 C469.23,136.06 196.62,156.69 131,211 C106.87,230.97 96.25,266.15 91.59,291.66 " fill="none" id="C_0000000716-&gt;C_0000000713" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="90.74,296.63,96.1999,288.4331,91.5828,291.7015,88.3143,287.0845,90.74,296.63" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[7eaaf9aff18dbd2b703828b5695fe221]
 @startuml
-package [A] as C_0000000616 {
-package [AA] as C_0000000617 {
-package [A1] as C_0000000618 {
+package [A] as C_0000000699 {
+package [AA] as C_0000000700 {
+package [A1] as C_0000000701 {
 }
-package [A2] as C_0000000619 {
+package [A2] as C_0000000702 {
 }
-package [A3] as C_0000000620 {
+package [A3] as C_0000000703 {
 }
-package [A4] as C_0000000621 {
+package [A4] as C_0000000704 {
 }
-package [A5] as C_0000000622 {
+package [A5] as C_0000000705 {
 }
-package [A6] as C_0000000623 {
+package [A6] as C_0000000706 {
 }
-package [A7] as C_0000000624 {
+package [A7] as C_0000000707 {
 }
-package [A8] as C_0000000625 {
+package [A8] as C_0000000708 {
 }
-package [A9] as C_0000000626 {
+package [A9] as C_0000000709 {
 }
-package [A10] as C_0000000627 {
+package [A10] as C_0000000710 {
 }
-package [A11] as C_0000000628 {
+package [A11] as C_0000000711 {
 }
-package [A12] as C_0000000629 {
+package [A12] as C_0000000712 {
 }
-package [A13] as C_0000000630 {
+package [A13] as C_0000000713 {
 }
 }
 }
 
-package [B] as C_0000000631 {
-package [BB] as C_0000000632 {
-package [BBB] as C_0000000633 {
+package [B] as C_0000000714 {
+package [BB] as C_0000000715 {
+package [BBB] as C_0000000716 {
 }
 }
 }
 
 
-C_0000000633 ..> C_0000000618
-C_0000000633 ..> C_0000000619
-C_0000000633 ..> C_0000000620
-C_0000000633 ..> C_0000000621
-C_0000000633 ..> C_0000000622
-C_0000000633 ..> C_0000000624
-C_0000000633 ..> C_0000000625
-C_0000000633 ..> C_0000000626
-C_0000000633 ..> C_0000000623
-C_0000000633 ..> C_0000000627
-C_0000000633 ..> C_0000000628
-C_0000000633 ..> C_0000000629
-C_0000000633 ..> C_0000000630
+C_0000000716 ..> C_0000000701
+C_0000000716 ..> C_0000000702
+C_0000000716 ..> C_0000000703
+C_0000000716 ..> C_0000000704
+C_0000000716 ..> C_0000000705
+C_0000000716 ..> C_0000000707
+C_0000000716 ..> C_0000000708
+C_0000000716 ..> C_0000000709
+C_0000000716 ..> C_0000000706
+C_0000000716 ..> C_0000000710
+C_0000000716 ..> C_0000000711
+C_0000000716 ..> C_0000000712
+C_0000000716 ..> C_0000000713
 
 @enduml
 
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index d76032cf..f1feab21 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:341px;height:351px;" version="1.1" viewBox="0 0 341 351" width="341px" zoomAndPan="magnify"><defs><filter height="300%" id="fkan1rv7vqfot" 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></defs><g><!--MD5=[fc275de8a8649f63dfc32dd94ef80914]
-cluster C_0000000634--><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="257.2969" y2="257.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="249.9951">ns1</text><!--MD5=[5a068c168b82fceb67f019c01f4f5124]
-cluster C_0000000637--><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="183" x2="225" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="187" y="38.9951">ns3</text><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="61.292">«deprecated»</text><!--MD5=[20be3d4b8e88bff0ec83a8f7ebabb2c7]
-cluster C_0000000638--><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="105.2969" y2="105.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="97.9951">ns1</text><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="292.2969" y2="292.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="284.9951">ns2_v1_0_0</text><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="292.2969" y2="292.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="284.9951">ns2_v0_9_0</text><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="307.292">«deprecated»</text><polygon fill="#FFFFFF" filter="url(#fkan1rv7vqfot)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="140.2969" y2="140.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="132.9951">ns2</text><!--MD5=[dbd61c0a6dd341cf79dfed5240878031]
-link C_0000000639 to C_0000000635--><path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000000639-&gt;C_0000000635" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="248,269.55,252,260.55,248,264.55,244,260.55,248,269.55" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[c53298989984a4af4261340cf557e383]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:341px;height:351px;" version="1.1" viewBox="0 0 341 351" width="341px" zoomAndPan="magnify"><defs><filter height="300%" id="f1pqtan3x8or3r" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[3c76d66452b779cf0dbc71bc0be15993]
+cluster C_0000000717--><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="257.2969" y2="257.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="249.9951">ns1</text><!--MD5=[fd935c4d71d59ef51e627303d4ebed44]
+cluster C_0000000720--><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="183" x2="225" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="187" y="38.9951">ns3</text><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="61.292">«deprecated»</text><!--MD5=[9961a19b3d2a75e249f4ec8bef1113d8]
+cluster C_0000000721--><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="105.2969" y2="105.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="97.9951">ns1</text><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="292.2969" y2="292.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="284.9951">ns2_v1_0_0</text><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="292.2969" y2="292.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="284.9951">ns2_v0_9_0</text><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="307.292">«deprecated»</text><polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="140.2969" y2="140.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="132.9951">ns2</text><!--MD5=[6ec77afb2bc9a4e90e2f8a375dedab35]
+link C_0000000722 to C_0000000718--><path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000000722-&gt;C_0000000718" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="248,269.55,252,260.55,248,264.55,244,260.55,248,269.55" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[590dd0b93522dd719788d95a3988f022]
 @startuml
-package [ns1] as C_0000000634 {
-package [ns2_v1_0_0] as C_0000000635 {
+package [ns1] as C_0000000717 {
+package [ns2_v1_0_0] as C_0000000718 {
 }
-package [ns2_v0_9_0] as C_0000000636 <<deprecated>> {
+package [ns2_v0_9_0] as C_0000000719 <<deprecated>> {
 }
 }
 
-package [ns3] as C_0000000637 <<deprecated>> {
-package [ns1] as C_0000000638 {
-package [ns2] as C_0000000639 {
+package [ns3] as C_0000000720 <<deprecated>> {
+package [ns1] as C_0000000721 {
+package [ns2] as C_0000000722 {
 }
 }
 }
 
 
-C_0000000639 ..> C_0000000635
+C_0000000722 ..> C_0000000718
 
 @enduml
 
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 9ba5ea69..8591f854 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="338px" preserveAspectRatio="none" style="width:701px;height:338px;" version="1.1" viewBox="0 0 701 338" width="701px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xy00t0v5b4fh" 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></defs><g><!--MD5=[6885d17d1f58a849b8a06e9748036424]
-cluster C_0000000640--><polygon fill="#008000" filter="url(#f1xy00t0v5b4fh)" points="22,24,39,24,46,46.2969,679,46.2969,679,326,22,326,22,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text><path d="M38,186 L38,211.1328 L148,211.1328 L148,196 L138,186 L38,186 " fill="#FBFB77" filter="url(#f1xy00t0v5b4fh)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M138,186 L138,196 L148,196 L138,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="44" y="203.0669">Package AAA.</text><path d="M553,73 L553,98.1328 L663,98.1328 L663,83 L653,73 L553,73 " fill="#FBFB77" filter="url(#f1xy00t0v5b4fh)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M653,73 L653,83 L663,83 L653,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="559" y="90.0669">Package BBB.</text><path d="M287,285 L287,310.1328 L439,310.1328 L439,295 L429,285 L287,285 " fill="#FBFB77" filter="url(#f1xy00t0v5b4fh)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M429,285 L429,295 L439,295 L429,285 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="293" y="302.0669">CCCC package note.</text><path d="M293,73 L293,98.1328 L433,98.1328 L433,83 L423,73 L293,73 " fill="#FBFB77" filter="url(#f1xy00t0v5b4fh)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M423,73 L423,83 L433,83 L423,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="119" x="299" y="90.0669">Another CCC note.</text><path d="M126.5,73 L126.5,98.1328 L257.5,98.1328 L257.5,83 L247.5,73 L126.5,73 " fill="#FBFB77" filter="url(#f1xy00t0v5b4fh)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M247.5,73 L247.5,83 L257.5,83 L247.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="132.5" y="90.0669">We skipped DDD.</text><polygon fill="#FFFFFF" filter="url(#f1xy00t0v5b4fh)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f1xy00t0v5b4fh)" points="468,59,504,59,511,81.2969,518,81.2969,518,111.5938,468,111.5938,468,59" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="468" x2="511" y1="81.2969" y2="81.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="472" y="73.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f1xy00t0v5b4fh)" points="336.5,172,375.5,172,382.5,194.2969,389.5,194.2969,389.5,224.5938,336.5,224.5938,336.5,172" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="336.5" x2="382.5" y1="194.2969" y2="194.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="340.5" y="186.9951">CCC</text><polygon fill="#FFC0CB" filter="url(#f1xy00t0v5b4fh)" points="183.5,172,216.5,172,223.5,194.2969,230.5,194.2969,230.5,224.5938,183.5,224.5938,183.5,172" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="183.5" x2="223.5" y1="194.2969" y2="194.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="187.5" y="186.9951">EEE</text><!--MD5=[68cae48d6cc7291982fd3947b0fb0ea2]
-link C_0000000641 to GMN606--><path d="M71.49,112.24 C77.34,135.43 85.67,168.45 90.05,185.8 " fill="none" id="C_0000000641-GMN606" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[6458441595580356bfe76cf63df2b94f]
-link C_0000000642 to GMN610--><path d="M518.16,85.5 C529.74,85.5 541.32,85.5 552.9,85.5 " fill="none" id="C_0000000642-GMN610" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[1120ed7c35d5df83d8c48ccf343a2dad]
-link C_0000000643 to GMN614--><path d="M363,225.24 C363,244.55 363,270.08 363,284.75 " fill="none" id="C_0000000643-GMN614" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[b0f0dba67643ad4985991efd43e95657]
-link GMN617 to C_0000000643--><path d="M363,98.38 C363,115.83 363,148.82 363,171.93 " fill="none" id="GMN617-C_0000000643" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[2368b19c9000442670a35805b241eb59]
-link GMN621 to C_0000000645--><path d="M193.61,98.38 C195.96,115.83 200.42,148.82 203.54,171.93 " fill="none" id="GMN621-C_0000000645" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[6e291e9e4a092420e815f2fd9ddbeedd]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="338px" preserveAspectRatio="none" style="width:701px;height:338px;" version="1.1" viewBox="0 0 701 338" width="701px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hab37w8l979v" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[4b0b0d8e2021e7ab0d2b0df8a029024b]
+cluster C_0000000723--><polygon fill="#008000" filter="url(#f1hab37w8l979v)" points="22,24,39,24,46,46.2969,679,46.2969,679,326,22,326,22,24" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text><path d="M38,186 L38,211.1328 L148,211.1328 L148,196 L138,186 L38,186 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M138,186 L138,196 L148,196 L138,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="44" y="203.0669">Package AAA.</text><path d="M553,73 L553,98.1328 L663,98.1328 L663,83 L653,73 L553,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M653,73 L653,83 L663,83 L653,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="559" y="90.0669">Package BBB.</text><path d="M287,285 L287,310.1328 L439,310.1328 L439,295 L429,285 L287,285 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M429,285 L429,295 L439,295 L429,285 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="293" y="302.0669">CCCC package note.</text><path d="M293,73 L293,98.1328 L433,98.1328 L433,83 L423,73 L293,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M423,73 L423,83 L433,83 L423,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="119" x="299" y="90.0669">Another CCC note.</text><path d="M126.5,73 L126.5,98.1328 L257.5,98.1328 L257.5,83 L247.5,73 L126.5,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M247.5,73 L247.5,83 L257.5,83 L247.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="132.5" y="90.0669">We skipped DDD.</text><polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="468,59,504,59,511,81.2969,518,81.2969,518,111.5938,468,111.5938,468,59" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="468" x2="511" y1="81.2969" y2="81.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="472" y="73.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="336.5,172,375.5,172,382.5,194.2969,389.5,194.2969,389.5,224.5938,336.5,224.5938,336.5,172" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="336.5" x2="382.5" y1="194.2969" y2="194.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="340.5" y="186.9951">CCC</text><polygon fill="#FFC0CB" filter="url(#f1hab37w8l979v)" points="183.5,172,216.5,172,223.5,194.2969,230.5,194.2969,230.5,224.5938,183.5,224.5938,183.5,172" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="183.5" x2="223.5" y1="194.2969" y2="194.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="187.5" y="186.9951">EEE</text><!--MD5=[1e7797afeb9f6c04613ecdf607d004b6]
+link C_0000000724 to GMN608--><path d="M71.49,112.24 C77.34,135.43 85.67,168.45 90.05,185.8 " fill="none" id="C_0000000724-GMN608" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[b588b9173a25b7a45e511cf916d98487]
+link C_0000000725 to GMN612--><path d="M518.16,85.5 C529.74,85.5 541.32,85.5 552.9,85.5 " fill="none" id="C_0000000725-GMN612" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[ee68026c960c26c5446d77677bf12bce]
+link C_0000000726 to GMN616--><path d="M363,225.24 C363,244.55 363,270.08 363,284.75 " fill="none" id="C_0000000726-GMN616" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[5c9981a1b90ade129b890f23ebe40a79]
+link GMN619 to C_0000000726--><path d="M363,98.38 C363,115.83 363,148.82 363,171.93 " fill="none" id="GMN619-C_0000000726" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[34debd28d9f314c74e08de38205021cf]
+link GMN623 to C_0000000728--><path d="M193.61,98.38 C195.96,115.83 200.42,148.82 203.54,171.93 " fill="none" id="GMN623-C_0000000728" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[39a0b836e991520c6a14cdb74452c904]
 @startuml
-package [A] as C_0000000640 #green {
-package [AAA] as C_0000000641 {
+package [A] as C_0000000723 #green {
+package [AAA] as C_0000000724 {
 }
-note bottom of C_0000000641
+note bottom of C_0000000724
 Package AAA.
 end note
-package [BBB] as C_0000000642 {
+package [BBB] as C_0000000725 {
 }
-note right of C_0000000642
+note right of C_0000000725
 Package BBB.
 end note
-package [CCC] as C_0000000643 {
+package [CCC] as C_0000000726 {
 }
-note bottom of C_0000000643
+note bottom of C_0000000726
 CCCC package note.
 end note
-note top of C_0000000643
+note top of C_0000000726
 Another CCC note.
 end note
-package [EEE] as C_0000000645 #pink;line:red;line.bold;text:red {
+package [EEE] as C_0000000728 #pink;line:red;line.bold;text:red {
 }
-note top of C_0000000645
+note top of C_0000000728
 We skipped DDD.
 end note
 }
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 37132e8d..f0ed020d 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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="f1vler8xus12ai" 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></defs><g><!--MD5=[01027506614c122af4b78d5300d18c93]
-cluster C_0000000647--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[13ab3bd919096008e41481a8ea9b859d]
-cluster C_0000000648--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[a339ffca8bb29f54663e45af989bde48]
-cluster C_0000000650--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[b6bcc32ace5efaf46d2ce9670ede7f3a]
-cluster C_0000000651--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[0c8e60242241e507126e01108cd7728f]
-cluster C_0000000653--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[590f2bbf428599cc3865cd3245f28fd6]
-cluster C_0000000654--><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f1vler8xus12ai)" 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><!--MD5=[29e4bd4fca74cf83c2bd44bfa17f63d7]
-link C_0000000652 to C_0000000649--><path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0000000652-&gt;C_0000000649" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="154.6,296.77,154.9193,286.9263,152.7185,292.1375,147.5073,289.9367,154.6,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[82a8e22bf6fb0aa6d4eb26aaab886a28]
-link C_0000000655 to C_0000000649--><path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0000000655-&gt;C_0000000649" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="175.4,296.77,182.4927,289.9367,177.2815,292.1375,175.0807,286.9263,175.4,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[51ee8db4e3f79b9b1d8a13c1b6c36b37]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify"><defs><filter height="300%" id="f6lu3aa03o8np" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[33e2a78dd14afaa45cc2986bbb8da1ee]
+cluster C_0000000730--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[1a96d33c0cbd809ab6d465c2dc771710]
+cluster C_0000000731--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[7b47f9a833fdcf32d1ef1d9a6f9b4b97]
+cluster C_0000000733--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[b00e4e26baab1d0fc28eaef077b88c40]
+cluster C_0000000734--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[00e5e30984efb50424f11de94356f3c7]
+cluster C_0000000736--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[db3c113221e16814b9efc09e39aa8d88]
+cluster C_0000000737--><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text><polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/><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><!--MD5=[65681bf1035ad585d4fef648d8d931bb]
+link C_0000000735 to C_0000000732--><path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0000000735-&gt;C_0000000732" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="154.6,296.77,154.9193,286.9263,152.7185,292.1375,147.5073,289.9367,154.6,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[b7a0e2d29505710702fbd71c04afaae8]
+link C_0000000738 to C_0000000732--><path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0000000738-&gt;C_0000000732" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="175.4,296.77,182.4927,289.9367,177.2815,292.1375,175.0807,286.9263,175.4,296.77" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[88bc84b98d4c1f1fcd18d7ec2c089dd1]
 @startuml
-package [A] as C_0000000647 {
-package [AA] as C_0000000648 {
-package [AAA] as C_0000000649 {
+package [A] as C_0000000730 {
+package [AA] as C_0000000731 {
+package [AAA] as C_0000000732 {
 }
 }
 }
 
-package [B] as C_0000000650 {
-package [BB] as C_0000000651 {
-package [BBB] as C_0000000652 {
+package [B] as C_0000000733 {
+package [BB] as C_0000000734 {
+package [BBB] as C_0000000735 {
 }
 }
 }
 
-package [C] as C_0000000653 {
-package [CC] as C_0000000654 {
-package [CCC] as C_0000000655 {
+package [C] as C_0000000736 {
+package [CC] as C_0000000737 {
+package [CCC] as C_0000000738 {
 }
 }
 }
 
 
-C_0000000652 ..> C_0000000649
+C_0000000735 ..> C_0000000732
 
-C_0000000655 ..> C_0000000649
+C_0000000738 ..> C_0000000732
 
 @enduml
 
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 095ff054..92daf49f 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:268px;height:270px;" version="1.1" viewBox="0 0 268 270" width="268px" zoomAndPan="magnify"><defs><filter height="300%" id="f1oucgzsex1uuu" 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></defs><g><polygon fill="#FFFFFF" filter="url(#f1oucgzsex1uuu)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text><polygon fill="#FFFFFF" filter="url(#f1oucgzsex1uuu)" points="71.5,93,88.5,93,95.5,115.2969,102.5,115.2969,102.5,145.5938,71.5,145.5938,71.5,93" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="115.2969" y2="115.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="107.9951">A</text><polygon fill="#FFFFFF" filter="url(#f1oucgzsex1uuu)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text><path d="M40,8 L40,33.1328 L134,33.1328 L134,18 L124,8 L40,8 " fill="#FBFB77" filter="url(#f1oucgzsex1uuu)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M124,8 L124,18 L134,18 L124,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="46" y="25.0669">Top A note.</text><path d="M137.5,220 L137.5,245.1328 L256.5,245.1328 L256.5,230 L246.5,220 L137.5,220 " fill="#FBFB77" filter="url(#f1oucgzsex1uuu)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M246.5,220 L246.5,230 L256.5,230 L246.5,220 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="143.5" y="237.0669">Bottom A note.</text><!--MD5=[9fbb3968f357ba511688c2afc10d1f22]
-link GMN644 to C_0000000657--><path d="M87,33.01 C87,47.66 87,73.41 87,92.83 " fill="none" id="GMN644-C_0000000657" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[b70e154a2039507e7af077c7bf0d337f]
-link C_0000000657 to GMN647--><path d="M102.76,136.4 C125.1,158.94 165.45,199.66 185.31,219.71 " fill="none" id="C_0000000657-GMN647" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[64cea0f9caba4dc3b58215480e97a35d]
-link C_0000000657 to C_0000000656--><path d="M71.69,146.24 C61.86,162.78 49.06,184.31 38.78,201.6 " fill="none" id="C_0000000657-&gt;C_0000000656" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="36.22,205.89,44.2665,200.2108,38.7819,201.5962,37.3965,196.1117,36.22,205.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[97500f3fd866139afc8929423ec333e5]
-link C_0000000657 to C_0000000658--><path d="M87,146.24 C87,162.5 87,183.58 87,200.71 " fill="none" id="C_0000000657-&gt;C_0000000658" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="87,205.89,91.0257,196.9015,87.0143,200.89,83.0257,196.8786,87,205.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[ffde5f9295cb53524f9b79c5baac04f5]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:268px;height:270px;" version="1.1" viewBox="0 0 268 270" width="268px" zoomAndPan="magnify"><defs><filter height="300%" id="fmo0wqdzpar6h" width="300%" x="-1" y="-1"><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></defs><g><polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text><polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="71.5,93,88.5,93,95.5,115.2969,102.5,115.2969,102.5,145.5938,71.5,145.5938,71.5,93" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="115.2969" y2="115.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="107.9951">A</text><polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text><path d="M40,8 L40,33.1328 L134,33.1328 L134,18 L124,8 L40,8 " fill="#FBFB77" filter="url(#fmo0wqdzpar6h)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M124,8 L124,18 L134,18 L124,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="46" y="25.0669">Top A note.</text><path d="M137.5,220 L137.5,245.1328 L256.5,245.1328 L256.5,230 L246.5,220 L137.5,220 " fill="#FBFB77" filter="url(#fmo0wqdzpar6h)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M246.5,220 L246.5,230 L256.5,230 L246.5,220 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="143.5" y="237.0669">Bottom A note.</text><!--MD5=[0d21ea802d3d5a411bcfe4579b2fdc50]
+link GMN646 to C_0000000740--><path d="M87,33.01 C87,47.66 87,73.41 87,92.83 " fill="none" id="GMN646-C_0000000740" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[31282658f51345c29a25ba4de397bae7]
+link C_0000000740 to GMN649--><path d="M102.76,136.4 C125.1,158.94 165.45,199.66 185.31,219.71 " fill="none" id="C_0000000740-GMN649" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[d784c7e30a7307fa997f27fd6f38bc7f]
+link C_0000000740 to C_0000000739--><path d="M71.69,146.24 C61.86,162.78 49.06,184.31 38.78,201.6 " fill="none" id="C_0000000740-&gt;C_0000000739" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="36.22,205.89,44.2665,200.2108,38.7819,201.5962,37.3965,196.1117,36.22,205.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[5b991ff657d9955c8b6e804934325656]
+link C_0000000740 to C_0000000741--><path d="M87,146.24 C87,162.5 87,183.58 87,200.71 " fill="none" id="C_0000000740-&gt;C_0000000741" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="87,205.89,91.0257,196.9015,87.0143,200.89,83.0257,196.8786,87,205.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[1c32302c4bae5a748bb888211fe43666]
 @startuml
-package [B] as C_0000000656 {
+package [B] as C_0000000739 {
 }
 
-package [A] as C_0000000657 {
+package [A] as C_0000000740 {
 }
-note top of C_0000000657
+note top of C_0000000740
 Top A note.
 end note
-note bottom of C_0000000657
+note bottom of C_0000000740
 Bottom A note.
 end note
 
-package [C] as C_0000000658 {
+package [C] as C_0000000741 {
 }
 
 
-C_0000000657 ..> C_0000000656
-C_0000000657 ..> C_0000000658
+C_0000000740 ..> C_0000000739
+C_0000000740 ..> C_0000000741
 
 
 @enduml
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 9f383f50..b3794762 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:269px;height:277px;" version="1.1" viewBox="0 0 269 277" width="269px" zoomAndPan="magnify"><defs><filter height="300%" id="f1rmlor9rm688t" 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></defs><g><!--MD5=[01ca2dfb96e3948ad883a590ea0af0ee]
-cluster C_0000000661--><polygon fill="#FFFFFF" filter="url(#f1rmlor9rm688t)" points="42.5,57,59.5,57,66.5,79.2969,151.5,79.2969,151.5,177,42.5,177,42.5,57" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="42.5" x2="66.5" y1="79.2969" y2="79.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="46.5" y="71.9951">A</text><polygon fill="#FFFFFF" filter="url(#f1rmlor9rm688t)" points="72.5,213,88.5,213,95.5,235.2969,102.5,235.2969,102.5,265.5938,72.5,265.5938,72.5,213" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="72.5" x2="95.5" y1="235.2969" y2="235.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="76.5" y="227.9951">B</text><polygon fill="#FFFFFF" filter="url(#f1rmlor9rm688t)" points="66.5,100,94.5,100,101.5,122.2969,108.5,122.2969,108.5,152.5938,66.5,152.5938,66.5,100" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="66.5" x2="101.5" y1="122.2969" y2="122.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="70.5" y="114.9951">AA</text><polygon fill="#FFFFFF" filter="url(#f1rmlor9rm688t)" points="6,213,23,213,30,235.2969,37,235.2969,37,265.5938,6,265.5938,6,213" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="30" y1="235.2969" y2="235.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="10" y="227.9951">C</text><path d="M41,8 L41,33.1328 L246,33.1328 L246,18 L236,8 L41,8 " fill="#FBFB77" filter="url(#f1rmlor9rm688t)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M236,8 L236,18 L246,18 L236,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="47" y="25.0669">Compare layout with t30006.</text><path d="M138,227 L138,252.1328 L257,252.1328 L257,237 L247,227 L138,227 " fill="#FBFB77" filter="url(#f1rmlor9rm688t)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M247,227 L247,237 L257,237 L247,227 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="144" y="244.0669">Bottom A note.</text><!--MD5=[50a83e3eccaefa6a924a7ca639fd4aea]
-link GMN659 to C_0000000661--><path d="M143.5,33.03 C143.5,36.3613 143.5,40.2728 143.5,44.5714 C143.5,46.7207 143.5,48.9668 143.5,51.2855 C143.5,52.4448 143.5,53.6223 143.5,54.8149 C143.5,55.4112 143.5,56.0113 143.5,56.6148 " fill="none" id="GMN659-C_0000000661" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[343be96cb178954bfe5a5d306348487d]
-link C_0000000661 to GMN662--><path d="M151.6607,144.277 C151.7219,144.403 151.7835,144.5295 151.8453,144.6565 C152.0924,145.1647 152.3437,145.6812 152.5988,146.2057 C153.6194,148.3036 154.7021,150.5292 155.8341,152.8563 C158.0983,157.5105 160.56,162.5706 163.1175,167.8275 C173.3475,188.855 185.11,213.03 191.89,226.96 " fill="none" id="C_0000000661-GMN662" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[eb3ee97030ad72163c436889e5dc6db3]
-link C_0000000662 to C_0000000660--><path d="M87.5,153.24 C87.5,169.5 87.5,190.58 87.5,207.71 " fill="none" id="C_0000000662-&gt;C_0000000660" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="87.5,212.89,91.5257,203.9015,87.5143,207.89,83.5257,203.8786,87.5,212.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[20a3c93d9ab20a761a9dbfff165573dd]
-link C_0000000662 to C_0000000663--><path d="M66.45,146.33 C53.17,163.28 37.63,188.49 27.99,208.26 " fill="none" id="C_0000000662-&gt;C_0000000663" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="25.78,212.9,33.2451,206.4757,27.9186,208.3804,26.0138,203.0539,25.78,212.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[2794081f4fbc29c2d1d711c02e61ac1c]
-link C_0000000663 to C_0000000662--><!--MD5=[79360cf1365c9d2ce79a7a908275c2dd]
-link C_0000000663 to C_0000000660--><!--MD5=[27220622d9c7bd88e24beac43b50945c]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:269px;height:277px;" version="1.1" viewBox="0 0 269 277" width="269px" zoomAndPan="magnify"><defs><filter height="300%" id="fxdcq8s9hnnhp" width="300%" x="-1" y="-1"><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></defs><g><!--MD5=[d1fc78469c8b311e18dbfa6e57d01d46]
+cluster C_0000000744--><polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="42.5,57,59.5,57,66.5,79.2969,151.5,79.2969,151.5,177,42.5,177,42.5,57" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="42.5" x2="66.5" y1="79.2969" y2="79.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="46.5" y="71.9951">A</text><polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="72.5,213,88.5,213,95.5,235.2969,102.5,235.2969,102.5,265.5938,72.5,265.5938,72.5,213" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="72.5" x2="95.5" y1="235.2969" y2="235.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="76.5" y="227.9951">B</text><polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="66.5,100,94.5,100,101.5,122.2969,108.5,122.2969,108.5,152.5938,66.5,152.5938,66.5,100" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="66.5" x2="101.5" y1="122.2969" y2="122.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="70.5" y="114.9951">AA</text><polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="6,213,23,213,30,235.2969,37,235.2969,37,265.5938,6,265.5938,6,213" style="stroke: #000000; stroke-width: 1.5;"/><line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="30" y1="235.2969" y2="235.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="10" y="227.9951">C</text><path d="M41,8 L41,33.1328 L246,33.1328 L246,18 L236,8 L41,8 " fill="#FBFB77" filter="url(#fxdcq8s9hnnhp)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M236,8 L236,18 L246,18 L236,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="47" y="25.0669">Compare layout with t30006.</text><path d="M138,227 L138,252.1328 L257,252.1328 L257,237 L247,227 L138,227 " fill="#FBFB77" filter="url(#fxdcq8s9hnnhp)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M247,227 L247,237 L257,237 L247,227 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="144" y="244.0669">Bottom A note.</text><!--MD5=[2955fe2a330367dec072f8a220b77367]
+link GMN661 to C_0000000744--><path d="M143.5,33.03 C143.5,36.3613 143.5,40.2728 143.5,44.5714 C143.5,46.7207 143.5,48.9668 143.5,51.2855 C143.5,52.4448 143.5,53.6223 143.5,54.8149 C143.5,55.4112 143.5,56.0113 143.5,56.6148 " fill="none" id="GMN661-C_0000000744" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[b84f50f4832e9ff461737dbc13fdff3b]
+link C_0000000744 to GMN664--><path d="M151.6607,144.277 C151.7219,144.403 151.7835,144.5295 151.8453,144.6565 C152.0924,145.1647 152.3437,145.6812 152.5988,146.2057 C153.6194,148.3036 154.7021,150.5292 155.8341,152.8563 C158.0983,157.5105 160.56,162.5706 163.1175,167.8275 C173.3475,188.855 185.11,213.03 191.89,226.96 " fill="none" id="C_0000000744-GMN664" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><!--MD5=[51b1e6ab85bfff069d1a70a95c5d9257]
+link C_0000000745 to C_0000000743--><path d="M87.5,153.24 C87.5,169.5 87.5,190.58 87.5,207.71 " fill="none" id="C_0000000745-&gt;C_0000000743" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="87.5,212.89,91.5257,203.9015,87.5143,207.89,83.5257,203.8786,87.5,212.89" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[e5e39e299f477bc81e39c84255f234ce]
+link C_0000000745 to C_0000000746--><path d="M66.45,146.33 C53.17,163.28 37.63,188.49 27.99,208.26 " fill="none" id="C_0000000745-&gt;C_0000000746" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/><polygon fill="#A80036" points="25.78,212.9,33.2451,206.4757,27.9186,208.3804,26.0138,203.0539,25.78,212.9" style="stroke: #A80036; stroke-width: 1.0;"/><!--MD5=[86215bde0e95444dd215a6f473bf5e9c]
+link C_0000000746 to C_0000000745--><!--MD5=[fd472b1064eadde22e2903832ed771b0]
+link C_0000000746 to C_0000000743--><!--MD5=[b3c3b65175ff859197e75c223a4cdb1d]
 @startuml
-package [B] as C_0000000660 {
+package [B] as C_0000000743 {
 }
 
-package [A] as C_0000000661 {
-package [AA] as C_0000000662 {
+package [A] as C_0000000744 {
+package [AA] as C_0000000745 {
 }
 }
-note top of C_0000000661
+note top of C_0000000744
 Compare layout with t30006.
 end note
-note bottom of C_0000000661
+note bottom of C_0000000744
 Bottom A note.
 end note
 
-package [C] as C_0000000663 {
+package [C] as C_0000000746 {
 }
 
 
-C_0000000662 ..> C_0000000660
-C_0000000662 ..> C_0000000663
+C_0000000745 ..> C_0000000743
+C_0000000745 ..> C_0000000746
 
 
-C_0000000663 -[hidden]up- C_0000000662
-C_0000000663 -[hidden]left- C_0000000660
+C_0000000746 -[hidden]up- C_0000000745
+C_0000000746 -[hidden]left- C_0000000743
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)